]> granicus.if.org Git - php/commit
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)
commita7fc8eecb0a23a21666ddab2eb09a54a3e9690f5
tree31841d0e7297a9626cd6452790942a9ff7f6fb8e
parentad7793d94cdc852db2515ce30d8d97a9a0f3f0ab
parente2c9f3983ac81478e73fa86b8d218795aa9ee201
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add bundled libzip LICENSE, as required by BSD License terms