Merge branch 'PHP-7.0' into PHP-7.1
authorDmitry Stogov <dmitry@zend.com>
Thu, 1 Dec 2016 12:50:19 +0000 (15:50 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 1 Dec 2016 12:50:19 +0000 (15:50 +0300)
* PHP-7.0:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place

1  2 
ext/intl/grapheme/grapheme_string.c

Simple merge