From: Anatol Belski <ab@php.net>
Date: Tue, 24 Oct 2017 11:45:59 +0000 (+0200)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~1189
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69ecd5edb2d7cfd90be0fa7748daec1d3eb1ebe1;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283
---

69ecd5edb2d7cfd90be0fa7748daec1d3eb1ebe1