]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7dad26 ab4c4c3)
Merge branch 'PHP-5.5' into PHP-5.6
authorKeyur Govande <keyur@php.net>
Wed, 30 Jul 2014 02:41:01 +0000 (02:41 +0000)
committerKeyur Govande <keyur@php.net>
Wed, 30 Jul 2014 02:41:01 +0000 (02:41 +0000)
* PHP-5.5:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616


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