]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 10 Jul 2013 17:36:12 +0000 (19:36 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 10 Jul 2013 17:36:12 +0000 (19:36 +0200)

Trivial merge