]> granicus.if.org Git - php/commit
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)
commitcfd5ea43017500379ae302a67347641712e921ac
tree07308c146951e7a23a4b61d3cff675ac247a5873
parent9feb87b017b804dacac9867a85efad896cc6d59d
parent744f35d2ab9d5ef5ebb0276aa1b3fc0ceb872087
Merge branch 'PHP-5.5' into PHP-5.6

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