Merge tag 'upstream/0.1.3'
authorgregor herrmann <gregoa@debian.org>
Sat, 30 Mar 2013 18:22:38 +0000 (19:22 +0100)
committergregor herrmann <gregoa@debian.org>
Sat, 30 Mar 2013 18:22:38 +0000 (19:22 +0100)
Upstream version 0.1.3


Trivial merge