]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Fri, 24 Jan 2014 10:31:33 +0000 (12:31 +0200)
committerAndrey Hristov <andrey@php.net>
Fri, 24 Jan 2014 10:31:33 +0000 (12:31 +0200)

Trivial merge