From: Stanislav Malyshev <stas@php.net>
Date: Sun, 8 Dec 2013 23:53:41 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~138
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfd5ea43017500379ae302a67347641712e921ac;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Replace invalid code with a proper #error
---

cfd5ea43017500379ae302a67347641712e921ac