]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorLior Kaplan <kaplanlior@gmail.com>
Thu, 18 Feb 2016 09:25:10 +0000 (11:25 +0200)
committerLior Kaplan <kaplanlior@gmail.com>
Thu, 18 Feb 2016 09:25:10 +0000 (11:25 +0200)
* PHP-7.0:
  Sort 7.0.4 extensions by name, merge FPM entries


Trivial merge