]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 8 Dec 2013 23:53:41 +0000 (15:53 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 8 Dec 2013 23:53:41 +0000 (15:53 -0800)
* PHP-5.5:
  Replace invalid code with a proper #error


Trivial merge