From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 2 Jan 2019 08:46:56 +0000 (+0800)
Subject: Merge branch 'PHP-7.3'
X-Git-Tag: php-7.4.0alpha1~1311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b04829d10fc845823c0637d6a94c9273f06d316d;p=php

Merge branch 'PHP-7.3'

* PHP-7.3:
  Entry get lost while merging
---

b04829d10fc845823c0637d6a94c9273f06d316d