From: Lior Kaplan <kaplanlior@gmail.com>
Date: Wed, 11 Feb 2015 20:30:48 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~182^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c741faf4bb57cff872c412cbf1183cd33f13fbed;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #55508 was fixed in 5.5.19 with 15ba757a, not in 5.5.18
  Add missing NEWS entry for revert of bug #41631
  Add missing NEWS entry for bug #68027
  Align format for bug #68799
  Bug #68361 was fixed in 5.5.20 using 327d4f9a, not in 5.5.19
  Bug #55618 was fixed in 5.5.21 using eaf107c0
  Add security bugs fixed in 5.5.18
  Add CVE ID to bug #68676
  Align email format for recent NEWS entries
---

c741faf4bb57cff872c412cbf1183cd33f13fbed