]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Fri, 5 Dec 2014 16:05:37 +0000 (17:05 +0100)
committerJulien Pauli <jpauli@php.net>
Fri, 5 Dec 2014 16:05:37 +0000 (17:05 +0100)
* PHP-5.5:
  Updated NEWS
  Start adding new attribute to control multi statements

1  2 
ext/pdo_mysql/mysql_driver.c

Simple merge