From: Lior Kaplan <kaplanlior@gmail.com>
Date: Thu, 18 Feb 2016 09:25:10 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~608
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d051fbc1e5255d295c944c0fad097f3607e6127f;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Sort 7.0.4 extensions by name, merge FPM entries
---

d051fbc1e5255d295c944c0fad097f3607e6127f