]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Mon, 14 Apr 2014 14:44:21 +0000 (17:44 +0300)
committerAndrey Hristov <andrey@php.net>
Mon, 14 Apr 2014 14:44:21 +0000 (17:44 +0300)

Trivial merge