Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Thu, 24 Sep 2015 07:49:48 +0000 (10:49 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 24 Sep 2015 07:49:48 +0000 (10:49 +0300)
* PHP-7.0:
  Attmpt to fix "Unable to reattach to base address" problem. (Matt Ficken)


Trivial merge