]> granicus.if.org Git - php/commitdiff
Merge branch 'master' into merge-fastcgi
authorXinchen Hui <laruence@gmail.com>
Sat, 23 May 2015 02:29:45 +0000 (10:29 +0800)
committerXinchen Hui <laruence@gmail.com>
Sat, 23 May 2015 02:29:45 +0000 (10:29 +0800)
1  2 
win32/build/config.w32

Simple merge