]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Mon, 3 Feb 2014 03:21:27 +0000 (04:21 +0100)
committerFerenc Kovacs <tyrael@php.net>
Mon, 3 Feb 2014 03:21:27 +0000 (04:21 +0100)

Trivial merge