]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Merge branch 'develop' of github.com:Dead2/zlib-ng into develop
authorHans Kristian Rosbach <hk-git@circlestorm.org>
Tue, 12 May 2015 14:04:15 +0000 (16:04 +0200)
committerHans Kristian Rosbach <hk-git@circlestorm.org>
Tue, 12 May 2015 14:04:15 +0000 (16:04 +0200)

Trivial merge