Merge pull request #2496 from Lukasa/cve
authorCory Benfield <lukasaoz@gmail.com>
Sun, 15 Mar 2015 11:50:51 +0000 (11:50 +0000)
committerCory Benfield <lukasaoz@gmail.com>
Sun, 15 Mar 2015 11:50:51 +0000 (11:50 +0000)
Update 2.6.0 changelog with CVE number CVE-2015-2296


Trivial merge