]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Fri, 20 Jun 2014 10:01:22 +0000 (14:01 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 20 Jun 2014 10:01:22 +0000 (14:01 +0400)
commit687fa7d63d651dcace32054a6e50131f9edfa07d
tree2aeb0ae58a134a8b34651e0042125ccfce5afdc8
parentae9db5d0a227977b4b2aac34f1ba7532896201b7
parentf08a5bfadc360cb53574bdb2f4dc32ac30636133
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed MarinaDB support