]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Wed, 29 Jan 2014 13:01:03 +0000 (14:01 +0100)
committerRemi Collet <remi@php.net>
Wed, 29 Jan 2014 13:01:03 +0000 (14:01 +0100)
* PHP-5.6:
  zip extension version 1.12.4


Trivial merge