]> granicus.if.org Git - php/commitdiff
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)
* '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


Trivial merge