]> granicus.if.org Git - php/commit
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)
commite79b54c4b5af6a125de9ca60f95b5fb29d204c5f
tree9351d2f3d4be43cef3cb8692726da9959d227e5b
parentc24f11450f4e4729add14019527925d0cd155b54
parent770aeeb40cd3174801127ccee1a71b6ef6635a18
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  tests still failing, so xfail for now until fixed