]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorPierre Joye <pierre.php@gmail.com>
Sat, 20 Apr 2013 16:25:27 +0000 (18:25 +0200)
committerPierre Joye <pierre.php@gmail.com>
Sat, 20 Apr 2013 16:25:27 +0000 (18:25 +0200)
* PHP-5.5:


Trivial merge