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)
commitb3e35d47800ee193ec373befa117c7c5baf6ff41
treef94216b8c0b0119dc30d61565aa9586b3d2583d8
parent9254d56de167329a51d98ad3a1e40b1d9074738f
parent6c96e0499b95151afe0f72f628a3c9b2bfbec25c
Merge remote-tracking branch 'mfischer/zlib' into next