]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Mon, 4 Nov 2013 21:21:03 +0000 (22:21 +0100)
committerPierre Joye <pierre.php@gmail.com>
Mon, 4 Nov 2013 21:21:03 +0000 (22:21 +0100)
commit07b9db3def852cfc7010e963e1466ecb62d86e74
treec2764c8773eae4094c03c77e58077200be5ad7db
parent55ee543e2f73c45c8fa2c51ebef9820a610f70b4
parenta07ae67a21912adb609819ad6d05edae6fdd28fc
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

# By Xinchen Hui
# Via Xinchen Hui
* 'PHP-5.5' of git.php.net:php-src:
  Fixed coredump due to abnormal implemention of phar
  remove "PHP 6" staff