]> granicus.if.org Git - php/commitdiff
Merge branch '5.3' into 5.4
authorGustavo André dos Santos Lopes <cataphract@php.net>
Wed, 28 Mar 2012 20:42:48 +0000 (21:42 +0100)
committerGustavo André dos Santos Lopes <cataphract@php.net>
Wed, 28 Mar 2012 20:42:48 +0000 (21:42 +0100)

Trivial merge