From: Christopher Jones <sixd@php.net>
Date: Fri, 20 Sep 2013 03:38:53 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~211^2~51^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d135e08a98bf2f3ca6d4d6bf65c68088faa66bc4;p=php

Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Added application/pdf to PHP CLI Web Server mime types.
---

d135e08a98bf2f3ca6d4d6bf65c68088faa66bc4