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

Merge branch 'PHP-7.1'

* PHP-7.1:
  Added editorconfig file
---

3e69fa2ad1ac35e10cb01a8fe3a05ff2ca5dc9e4