]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
authorAndrey Hristov <andrey@php.net>
Fri, 21 Mar 2014 12:33:44 +0000 (14:33 +0200)
committerAndrey Hristov <andrey@php.net>
Fri, 21 Mar 2014 12:33:44 +0000 (14:33 +0200)

Trivial merge