]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55ee543 a07ae67)
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)
# 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.