]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Tue, 6 May 2014 09:17:29 +0000 (12:17 +0300)
committerAndrey Hristov <andrey@php.net>
Tue, 6 May 2014 09:17:29 +0000 (12:17 +0300)

Trivial merge