From: Stanislav Malyshev <stas@php.net>
Date: Mon, 5 Sep 2016 07:41:23 +0000 (-0700)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC2~56^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e0605044a7d7c4b18855c0911a5818bc45b358d;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Added editorconfig file
---

4e0605044a7d7c4b18855c0911a5818bc45b358d