]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Mon, 16 Jan 2017 09:18:50 +0000 (01:18 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 16 Jan 2017 09:18:50 +0000 (01:18 -0800)
commit34d6b63501d7107be6a46d0dee1139e11a3b8f7e
tree598c90617bd6c0ee89bb223577e508fe7af4a8cc
parentbac4c97602d53b6f07737ce0b51f8a39857cbf76
parent6736527aebcbdc32efda3ab178ef7d17234e5b72
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #73634 - grapheme_strpos illegal memory access
  Fix typo
ext/intl/grapheme/grapheme_string.c