Merge tag 'upstream/1.7'
authorgregor herrmann <gregoa@debian.org>
Wed, 6 Jun 2012 23:04:04 +0000 (01:04 +0200)
committergregor herrmann <gregoa@debian.org>
Wed, 6 Jun 2012 23:04:04 +0000 (01:04 +0200)
commit2ecaf6a3da2b69a2e1a6a47650c228a986e75967
treebe2cf7b9ee457f86f6e31221d1b5f73613b84fca
parent37ba32e681651a6bc832f610d7112df25ef31081
parentaa1c6915058ccf6710e5e53355c19915669378bf
Merge tag 'upstream/1.7'

Upstream version 1.7