]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 590c45f 9ceab1e)
Merge commit 'stevee/openssl'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Apr 2010 13:59:26 +0000 (15:59 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Apr 2010 13:59:26 +0000 (15:59 +0200)

Trivial merge
IPFire 3.x development tree