Merge pull request #6758 from popcornmix/jpegtimeout
authorjenkins4kodi <jenkins4kodi@users.noreply.github.com>
Fri, 20 Mar 2015 13:09:16 +0000 (14:09 +0100)
committerjenkins4kodi <jenkins4kodi@users.noreply.github.com>
Fri, 20 Mar 2015 13:09:16 +0000 (14:09 +0100)

Trivial merge