]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Wed, 20 Aug 2014 21:44:40 +0000 (14:44 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 20 Aug 2014 21:44:40 +0000 (14:44 -0700)
* PHP-5.6:
  fix test


Trivial merge