]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Wed, 20 Feb 2013 10:58:01 +0000 (11:58 +0100)
committerJohannes Schlüter <johannes@php.net>
Wed, 20 Feb 2013 10:58:01 +0000 (11:58 +0100)

Trivial merge