]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8dafd71 6db5309)
Merge branch 'openssl-update' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Dec 2013 12:32:38 +0000 (13:32 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Dec 2013 12:32:38 +0000 (13:32 +0100)

Trivial merge
Peter's tree of IPFire 2.x