]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Thu, 25 Apr 2013 16:05:40 +0000 (18:05 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 25 Apr 2013 16:05:40 +0000 (18:05 +0200)

Trivial merge