]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 17 Jan 2014 10:08:21 +0000 (11:08 +0100)
committerAnatol Belski <ab@php.net>
Fri, 17 Jan 2014 10:08:21 +0000 (11:08 +0100)

Trivial merge