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


Trivial merge