]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Wed, 15 May 2013 13:54:52 +0000 (15:54 +0200)
committerPierre Joye <pierre.php@gmail.com>
Wed, 15 May 2013 13:54:52 +0000 (15:54 +0200)
* PHP-5.4:


Trivial merge