Merge tag 'upstream/2.10+ds'
authorgregor herrmann <gregoa@debian.org>
Wed, 12 Mar 2014 17:26:57 +0000 (18:26 +0100)
committergregor herrmann <gregoa@debian.org>
Wed, 12 Mar 2014 17:26:57 +0000 (18:26 +0100)
Upstream version 2.10+ds

Conflicts:
src/txt/CHANGELOG


Trivial merge