]> granicus.if.org Git - php/commit
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)
commit2e2cbcc926f8492dcaa2ca0a4e384c8d20edc851
tree630d3b7f421a3efcbd3fda3e4ff5697f0321b28e
parentf736934af08d8cef65860bd1a0bdf12f3630ae39
parent827d2c14150197e20897cba39c1824aa910df95a
Merge branch 'PHP-5.5' into PHP-5.6

* 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