]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Tue, 18 Mar 2014 14:19:34 +0000 (16:19 +0200)
committerAndrey Hristov <andrey@php.net>
Tue, 18 Mar 2014 14:19:34 +0000 (16:19 +0200)

Trivial merge