]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Wed, 7 Oct 2015 09:22:17 +0000 (12:22 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 7 Oct 2015 09:22:17 +0000 (12:22 +0300)
* PHP-7.0:
  Fixed test running on MarinaDB.


Trivial merge