Merge tag 'upstream/2.0'
authorgregor herrmann <gregoa@debian.org>
Mon, 13 Jan 2014 17:46:16 +0000 (18:46 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 13 Jan 2014 17:46:16 +0000 (18:46 +0100)
Upstream version 2.0


Trivial merge