]> 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: 9254d56 6c96e04)
Merge remote-tracking branch 'mfischer/zlib' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 22:59:26 +0000 (23:59 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 22:59:26 +0000 (23:59 +0100)

Trivial merge
Peter's tree of IPFire 2.x