]> granicus.if.org Git - php/commit
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Thu, 11 Oct 2012 00:28:39 +0000 (17:28 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 11 Oct 2012 00:28:39 +0000 (17:28 -0700)
commit8effd6fe68b1041537d8670ca2e5d43a6bb80925
tree78a0bb5c2fb1da74a766cd5d7329034298582de3
parentcd75cc3bebee3536c051797dc2d3c058b98676ba
parent7a7b2a06420138d0e0f18a898cb36d007196a922
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
  Fix warnings preventing this test from passing
  Remove executable permission on inc