From: Stanislav Malyshev <stas@php.net>
Date: Mon, 16 Jan 2017 09:18:57 +0000 (-0800)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~520
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31391729ffc7ebf97f42b7b9fb4135e018d41d08;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix bug #73634 - grapheme_strpos illegal memory access
  Fix typo
---

31391729ffc7ebf97f42b7b9fb4135e018d41d08