]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorLior Kaplan <kaplanlior@gmail.com>
Thu, 18 Jun 2015 13:57:04 +0000 (16:57 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Thu, 18 Jun 2015 13:57:04 +0000 (16:57 +0300)
* PHP-5.6:
  Add CVE to bugs #69545, #69646 and #69667


Trivial merge