]> 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: 0f90adc 12f8cdd)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into openssl-update
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 25 Dec 2013 19:44:24 +0000 (20:44 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 25 Dec 2013 19:44:24 +0000 (20:44 +0100)

Trivial merge
Peter's tree of IPFire 2.x