]> granicus.if.org Git - php/commit
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Wed, 7 Oct 2015 09:27:40 +0000 (20:27 +1100)
committerChristopher Jones <sixd@php.net>
Wed, 7 Oct 2015 09:27:40 +0000 (20:27 +1100)
commit06f99d14e4dc1e3af12d99bac923e1d80aa09ced
tree3aa382345679d2328e1407302e0729b5cd10bdc7
parent9b2c26b8d5f8491a5813ca0941353232eee4e6c4
parentdbb0ed0c1bf5435e620db5f99ce66c918b9f8bad
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fixed test running on MarinaDB.