]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Thu, 12 Dec 2013 12:46:37 +0000 (16:46 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 12 Dec 2013 12:46:37 +0000 (16:46 +0400)
* 'PHP-5.6' of git.php.net:php-src:
  fix test


Trivial merge