]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Wed, 30 Jan 2013 23:59:10 +0000 (00:59 +0100)
committerJohannes Schlüter <johannes@php.net>
Wed, 30 Jan 2013 23:59:10 +0000 (00:59 +0100)

Trivial merge