]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 29 Oct 2013 08:02:44 +0000 (09:02 +0100)
committerRemi Collet <remi@php.net>
Tue, 29 Oct 2013 08:02:44 +0000 (09:02 +0100)
* PHP-5.4:
  add bundled libzip LICENSE, as required by BSD License terms


Trivial merge