]> granicus.if.org Git - php/commitdiff
Merge branch 'fr61871'
authorGustavo André dos Santos Lopes <cataphract@php.net>
Sun, 13 May 2012 20:36:21 +0000 (21:36 +0100)
committerGustavo André dos Santos Lopes <cataphract@php.net>
Sun, 13 May 2012 20:36:21 +0000 (21:36 +0100)

Trivial merge