]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 101c055 b01b971)
Merge branch 'master' of https://git.php.net/repository/php-src
authorXinchen Hui <laruence@php.net>
Fri, 15 Aug 2014 08:58:22 +0000 (16:58 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 15 Aug 2014 08:58:22 +0000 (16:58 +0800)
Conflicts:
ext/mysqli/mysqli_api.c


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