]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Wed, 24 Apr 2013 17:17:11 +0000 (10:17 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 24 Apr 2013 17:17:11 +0000 (10:17 -0700)
* PHP-5.5:
  5.4.16-dev


Trivial merge