]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorLior Kaplan <kaplanlior@gmail.com>
Thu, 18 Jun 2015 12:50:11 +0000 (15:50 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Thu, 18 Jun 2015 12:50:11 +0000 (15:50 +0300)
* PHP-5.4:
  Add CVE to bugs #69545, #69646 and #69667


Trivial merge