]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Wed, 23 May 2012 05:53:25 +0000 (13:53 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 23 May 2012 05:53:25 +0000 (13:53 +0800)
* PHP-5.4:
  Revert NEWS
  Revert "Implemented FR #61602 Allow access to name of constant used as default value"
  Fix typo while resolving conflicts
  Revert "Implemented FR #61602 Allow access to name of constant used as default value"


Trivial merge