]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d483e1d dae70a2)
Merge branch 'PHP-5.5' into PHP-5.6
authorAndrey Hristov <andrey@php.net>
Mon, 14 Apr 2014 14:44:13 +0000 (17:44 +0300)
committerAndrey Hristov <andrey@php.net>
Mon, 14 Apr 2014 14:44:13 +0000 (17:44 +0300)
Conflicts:
ext/mysqli/tests/mysqli_change_user_old.phpt


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