]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Tue, 5 Aug 2014 13:46:52 +0000 (15:46 +0200)
committerMichael Wallner <mike@php.net>
Tue, 5 Aug 2014 13:46:52 +0000 (15:46 +0200)
commitfa57c291bb681044cbc215a88580679afed7ac7c
tree9492a52e9fbaf005ad246d56b1095522ce316a35
parent0ab5854863f1fee011bb0685fa47d0042d4a2392
parente4ff7f2ee346d641715694209e61704c9e815483
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed Bug #67724
ext/zlib/zlib_filter.c