]> 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: 4be400c 91900de)
Merge remote branch 'stevee/openssl' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 28 Nov 2010 20:43:43 +0000 (21:43 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 28 Nov 2010 20:43:43 +0000 (21:43 +0100)

Trivial merge
IPFire 3.x development tree