]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAdam Harvey <aharvey@php.net>
Fri, 23 May 2014 15:14:00 +0000 (15:14 +0000)
committerAdam Harvey <aharvey@php.net>
Fri, 23 May 2014 15:14:00 +0000 (15:14 +0000)
commit6d9cc9223894a0683b4e20abe6d3f25fd96c8b67
treeafd4179709e4089c237bf91eaf9f1a3c193b44f9
parente5e6ba093fd55e75554e549ed40ebbc75a8cf063
parent319611ffbd21f003755b679a90ffbdccbecab769
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken test caused by fdb2709.

Conflicts:
ext/intl/tests/dateformat_format.phpt
ext/intl/tests/dateformat_format.phpt