]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 2 Jul 2014 09:36:00 +0000 (11:36 +0200)
committerAnatol Belski <ab@php.net>
Wed, 2 Jul 2014 09:36:00 +0000 (11:36 +0200)

Trivial merge