From: Anatol Belski <ab@php.net>
Date: Sun, 15 Nov 2015 18:02:21 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha2~40^2~28^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4130118d0c818f5bfe09930401ca208c14080642;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #70917 install-pear-nozlib.phar missing
  Update mime type generator script to keep track of additional mime-types
  Added support for CSS/JavaScript source maps
---

4130118d0c818f5bfe09930401ca208c14080642