]> granicus.if.org Git - php/commit
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)
commitce99f292de4f98a189be014716717aa1ca89f492
treeaa493b6ed4f9e5dc1c7a1036bfb3a58fc7418b48
parentd483e1dacad1d274aa7fbd681fc802b83cb67b39
parentdae70a2ff76ff847b59d00ef75070afacdfa2208
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
ext/mysqli/tests/mysqli_change_user_old.phpt