From: Xinchen Hui <laruence@php.net>
Date: Wed, 23 May 2012 05:53:25 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0f62636e8cbb4f0fde9a0d149e29b598f215aae;p=php

Merge branch 'PHP-5.4'

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

c0f62636e8cbb4f0fde9a0d149e29b598f215aae