]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorStanislav Malyshev <stas@php.net>
Mon, 16 Jan 2017 09:18:57 +0000 (01:18 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 16 Jan 2017 09:18:57 +0000 (01:18 -0800)
* PHP-7.1:
  Fix bug #73634 - grapheme_strpos illegal memory access
  Fix typo


Trivial merge