]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Thu, 31 Jul 2014 18:28:19 +0000 (21:28 +0300)
committerAndrey Hristov <andrey@php.net>
Thu, 31 Jul 2014 18:28:19 +0000 (21:28 +0300)

Trivial merge