]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorDmitry Stogov <dmitry@zend.com>
Thu, 1 Dec 2016 12:51:16 +0000 (15:51 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 1 Dec 2016 12:51:16 +0000 (15:51 +0300)
* PHP-7.1:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place


Trivial merge