]> granicus.if.org Git - php/commitdiff
Merge branch 'master' into finally
authorXinchen Hui <laruence@php.net>
Wed, 22 Aug 2012 10:12:11 +0000 (18:12 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 22 Aug 2012 10:12:11 +0000 (18:12 +0800)

Trivial merge