Merge tag 'upstream/0.1.4'
authorgregor herrmann <gregoa@debian.org>
Sat, 16 Nov 2013 20:51:50 +0000 (21:51 +0100)
committergregor herrmann <gregoa@debian.org>
Sat, 16 Nov 2013 20:51:50 +0000 (21:51 +0100)
Upstream version 0.1.4


Trivial merge