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

Trivial merge