]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Thu, 30 Jan 2014 07:48:19 +0000 (23:48 -0800)
committerStanislav Malyshev <stas@php.net>
Thu, 30 Jan 2014 07:48:19 +0000 (23:48 -0800)
* PHP-5.4:
  tests still failing, so xfail for now until fixed


Trivial merge