]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 7 Jul 2014 17:42:13 +0000 (10:42 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 7 Jul 2014 17:42:13 +0000 (10:42 -0700)
commit41448bff7cd00623f7b43e9aff0a443e7731e93b
treea3fd93537aee2a365e5d4293544d22a30a5afc9d
parent31b395ac688d4d68de38c4efbc3c00fa9245c4eb
parent551696363332942d26209368f441f6f152be4769
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  create locales and re-add test

Conflicts:
.travis.yml
.travis.yml