]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorJohannes Schlüter <johannes@php.net>
Thu, 24 Jul 2014 14:58:50 +0000 (16:58 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 24 Jul 2014 14:58:50 +0000 (16:58 +0200)

Trivial merge