Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Thu, 21 Aug 2014 20:42:14 +0000 (22:42 +0200)
committerMichael Wallner <mike@php.net>
Thu, 21 Aug 2014 20:43:25 +0000 (22:43 +0200)
commitc4fb183b9fd6fecf7dfb8df309bfa34ff1ec2e53
treec8472f27483ae7da03407019f6e592746002ff48
parentdbbf1c2a3cff5908afd5229c58e52440073116f8
parent54fbbded372b771cf281a73e1981cde642107924
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #67865
NEWS
ext/zlib/zlib_filter.c