]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorLior Kaplan <kaplanlior@gmail.com>
Tue, 19 Aug 2014 22:01:23 +0000 (01:01 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Tue, 19 Aug 2014 22:01:23 +0000 (01:01 +0300)
* PHP-5.4:
  Add NEWS entry for bug #67730
  Add CVE ID for bug #67539


Trivial merge