]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Wed, 16 Jul 2014 16:50:41 +0000 (19:50 +0300)
committerAndrey Hristov <andrey@php.net>
Wed, 16 Jul 2014 16:50:41 +0000 (19:50 +0300)

Trivial merge