]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Thu, 8 May 2014 08:11:44 +0000 (01:11 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 8 May 2014 08:11:44 +0000 (01:11 -0700)
* PHP-5.5:
  make release tags not fail Travis CI


Trivial merge