]> 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>
Fri, 8 May 2015 13:09:34 +0000 (15:09 +0200)
committerHans Kristian Rosbach <hk-git@circlestorm.org>
Fri, 8 May 2015 13:09:34 +0000 (15:09 +0200)

Trivial merge