Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Mon, 5 Sep 2016 07:41:23 +0000 (00:41 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 5 Sep 2016 07:41:23 +0000 (00:41 -0700)
commit4e0605044a7d7c4b18855c0911a5818bc45b358d
tree87aec76e921d1efbe26ad52157c27e73924c8028
parent92db92c6201c5912e151b2de507c305dc6296efe
parent5c38fbe5435cb5641540f56023fdd8aac2d5e5e4
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Added editorconfig file