From: Lior Kaplan <kaplanlior@gmail.com>
Date: Thu, 19 Mar 2015 00:36:28 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61d11d7e109c5aca4c8d7c399902ebdfbb609f92;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Align entries format
  Add CVE to bug #69248
  Add CVE assigned to 5.5.22 bugs after the release
---

61d11d7e109c5aca4c8d7c399902ebdfbb609f92