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)
commit59d69002f49497ead658c5fdc85fc7d14384d716
tree59683a1ec61c07930c11bd934d144fb713f0649f
parentd68c55ae1ab0b2c8b4afb43868fa0d9193ab1b65
parentb81b04b43ee7726f8f0d589129c892349a4ad24c
Merge tag 'upstream/2.10+ds'

Upstream version 2.10+ds

Conflicts:
src/txt/CHANGELOG