From: Pierre Joye <pierre.php@gmail.com>
Date: Mon, 4 Nov 2013 21:21:03 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.11RC1~22^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07b9db3def852cfc7010e963e1466ecb62d86e74;p=php

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
---

07b9db3def852cfc7010e963e1466ecb62d86e74