]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8cc0cd 20e76f4)
Merge branch 'PHP-5.3' into PHP-5.4
authorULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 10:17:13 +0000 (12:17 +0200)
committerULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 10:17:13 +0000 (12:17 +0200)
* PHP-5.3:
  Minor changes for MySQL 5.6
  NEWS for 76601c4

Conflicts:
NEWS


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