]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
authorChristopher Jones <sixd@php.net>
Tue, 18 Sep 2012 00:10:53 +0000 (17:10 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 18 Sep 2012 00:10:53 +0000 (17:10 -0700)
* 'PHP-5.3' of https://git.php.net/repository/php-src:
  test should fail


Trivial merge