]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Tue, 21 Jan 2014 10:21:28 +0000 (11:21 +0100)
committerFerenc Kovacs <tyrael@php.net>
Tue, 21 Jan 2014 10:21:28 +0000 (11:21 +0100)

Trivial merge