Merge pull request #7141 from Fneufneu/CVE-2015-3885_dcraw_vuln
authorjenkins4kodi <jenkins4kodi@users.noreply.github.com>
Sun, 12 Jul 2015 13:09:51 +0000 (15:09 +0200)
committerjenkins4kodi <jenkins4kodi@users.noreply.github.com>
Sun, 12 Jul 2015 13:09:51 +0000 (15:09 +0200)

Trivial merge