]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Fri, 20 Sep 2013 03:38:53 +0000 (20:38 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 20 Sep 2013 03:38:53 +0000 (20:38 -0700)
* 'master' of https://git.php.net/repository/php-src:
  Added application/pdf to PHP CLI Web Server mime types.


Trivial merge