]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Wed, 25 Dec 2013 06:23:55 +0000 (22:23 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 25 Dec 2013 06:23:55 +0000 (22:23 -0800)
* PHP-5.6:
  5.4.25 next


Trivial merge