From: Lior Kaplan <kaplanlior@gmail.com>
Date: Thu, 18 Jun 2015 12:50:11 +0000 (+0300)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.27RC1~9^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=189af22cf05793a92851ed5d168eadd527c83286;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add CVE to bugs #69545, #69646 and #69667
---

189af22cf05793a92851ed5d168eadd527c83286