]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@gmail.com>
Thu, 12 Dec 2013 16:15:11 +0000 (00:15 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 12 Dec 2013 16:15:11 +0000 (00:15 +0800)

Trivial merge