]> 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>
Thu, 5 Sep 2013 17:49:21 +0000 (10:49 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 5 Sep 2013 17:49:21 +0000 (10:49 -0700)
# By Julien Pauli
# Via Julien Pauli
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  5.5.5 now


Trivial merge