]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6
authorXinchen Hui <laruence@gmail.com>
Sun, 15 Dec 2013 08:55:29 +0000 (16:55 +0800)
committerXinchen Hui <laruence@gmail.com>
Sun, 15 Dec 2013 08:55:29 +0000 (16:55 +0800)

Trivial merge