From: Stanislav Malyshev <stas@php.net>
Date: Mon, 16 Jan 2017 09:18:50 +0000 (-0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34d6b63501d7107be6a46d0dee1139e11a3b8f7e;p=php

Merge branch 'PHP-7.0' into PHP-7.1

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

34d6b63501d7107be6a46d0dee1139e11a3b8f7e