]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f7f842 258c76e)
Merge branch 'PHP-5.4' into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Wed, 9 Jan 2013 18:03:56 +0000 (19:03 +0100)
committerAndrey Hristov <andrey@php.net>
Wed, 9 Jan 2013 18:03:56 +0000 (19:03 +0100)
Conflicts:
ext/mysqlnd/mysqlnd_enum_n_def.h


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