summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-01-29 23:48:19 -0800
committerStanislav Malyshev <stas@php.net>2014-01-29 23:48:19 -0800
commite79b54c4b5af6a125de9ca60f95b5fb29d204c5f (patch)
tree9351d2f3d4be43cef3cb8692726da9959d227e5b
parentc24f11450f4e4729add14019527925d0cd155b54 (diff)
parent770aeeb40cd3174801127ccee1a71b6ef6635a18 (diff)
downloadphp-git-e79b54c4b5af6a125de9ca60f95b5fb29d204c5f.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: tests still failing, so xfail for now until fixed
0 files changed, 0 insertions, 0 deletions