]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@gmail.com>
Thu, 12 Dec 2013 17:46:28 +0000 (01:46 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 12 Dec 2013 17:46:28 +0000 (01:46 +0800)

Trivial merge