]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Tue, 19 Jun 2012 15:18:00 +0000 (17:18 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 19 Jun 2012 15:18:00 +0000 (17:18 +0200)
* PHP-5.4:
  sync zip ext version with pecl


Trivial merge