]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Tue, 28 Jan 2014 13:47:50 +0000 (15:47 +0200)
committerAndrey Hristov <andrey@php.net>
Tue, 28 Jan 2014 13:47:50 +0000 (15:47 +0200)

Trivial merge