]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Tue, 1 Oct 2013 12:40:28 +0000 (05:40 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 1 Oct 2013 12:40:28 +0000 (05:40 -0700)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)


Trivial merge