]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorJohannes Schlüter <johannes@php.net>
Thu, 29 Mar 2012 09:44:10 +0000 (11:44 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 29 Mar 2012 09:44:10 +0000 (11:44 +0200)
* PHP-5.4:
  This will be PHP 5.3.12


Trivial merge