From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 10 Apr 2017 03:44:50 +0000 (+0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c32281d4066b6b860192b1c83049659fbd8bdcbc;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c)
---

c32281d4066b6b860192b1c83049659fbd8bdcbc