]> granicus.if.org Git - php/commitdiff
Merge remote branch 'origin/PHP-5.4' into 5.4
authorGustavo André dos Santos Lopes <cataphract@php.net>
Wed, 28 Mar 2012 12:13:52 +0000 (13:13 +0100)
committerGustavo André dos Santos Lopes <cataphract@php.net>
Wed, 28 Mar 2012 12:13:52 +0000 (13:13 +0100)

Trivial merge