]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorKeyur Govande <keyur@php.net>
Wed, 30 Jul 2014 02:47:44 +0000 (02:47 +0000)
committerKeyur Govande <keyur@php.net>
Wed, 30 Jul 2014 02:47:44 +0000 (02:47 +0000)
* PHP-5.6:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616


Trivial merge