Merge branch 'feature/download-non-blocking'
authorIngo Ruhnke <grumbel@gmail.com>
Tue, 26 Aug 2014 22:58:42 +0000 (00:58 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Tue, 26 Aug 2014 22:58:42 +0000 (00:58 +0200)

Trivial merge