]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccc06e2 bc419fe)
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Sat, 13 Feb 2016 14:21:16 +0000 (15:21 +0100)
committerNikita Popov <nikic@php.net>
Sat, 13 Feb 2016 14:21:16 +0000 (15:21 +0100)
Conflicts:
ext/pdo_mysql/mysql_driver.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.