From: Yasuo Ohgaki <yohgaki@php.net>
Date: Mon, 18 Jan 2016 01:52:48 +0000 (+0900)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.2.0alpha1~620^2~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a8c4a00843907e7cb88615ecfc57ee25ee44bf9;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
---

3a8c4a00843907e7cb88615ecfc57ee25ee44bf9