]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorLior Kaplan <kaplanlior@gmail.com>
Fri, 22 May 2015 08:18:32 +0000 (11:18 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Fri, 22 May 2015 08:18:32 +0000 (11:18 +0300)
* PHP-5.5:
  Add entry for bug #69354, fixed in 5.5.25
  Add entry about PCRE upgrade (rev 95fa7279)
  Add CVE for bugs in 5.5.25


Trivial merge