From: Stanislav Malyshev <stas@php.net>
Date: Mon, 5 Sep 2016 07:41:26 +0000 (-0700)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~1342^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d4411d7c86dcbc020435afc7c0827e7840ea0d0;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Added editorconfig file
---

0d4411d7c86dcbc020435afc7c0827e7840ea0d0