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