Merge tag 'upstream/0.1.3'
authorgregor herrmann <gregoa@debian.org>
Sun, 5 May 2013 16:55:11 +0000 (18:55 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 5 May 2013 16:55:11 +0000 (18:55 +0200)
Upstream version 0.1.3


Trivial merge