]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Thu, 21 Feb 2013 14:10:47 +0000 (15:10 +0100)
committerJohannes Schlüter <johannes@php.net>
Thu, 21 Feb 2013 14:10:47 +0000 (15:10 +0100)

Trivial merge