]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 19 Dec 2012 15:17:18 +0000 (16:17 +0100)
committerJohannes Schlüter <johannes@php.net>
Wed, 19 Dec 2012 15:17:18 +0000 (16:17 +0100)

Trivial merge