]> 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>
Wed, 5 Mar 2014 14:47:16 +0000 (16:47 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 5 Mar 2014 14:47:16 +0000 (16:47 +0200)

Trivial merge