]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 9 Dec 2013 00:26:34 +0000 (16:26 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 9 Dec 2013 00:26:34 +0000 (16:26 -0800)
commit912be1243207a334a856c0d759c978a3029fd6d5
treec64ce7f60adef122b8547da8e4b2cf875027841e
parente3ebe995c971d6e1cbe10d84b5f36a747c14434d
parentcfd5ea43017500379ae302a67347641712e921ac
Merge branch 'PHP-5.6'

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