Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Fri, 25 Sep 2015 08:01:12 +0000 (11:01 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 25 Sep 2015 08:01:12 +0000 (11:01 +0300)
* PHP-7.0:
  Make necessary separation (it might be possible to fix this in a better way, but this will requre some refactoring)


Trivial merge