Merge tag 'upstream/1.8'
authorgregor herrmann <gregoa@debian.org>
Sun, 16 Sep 2012 12:40:15 +0000 (14:40 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 16 Sep 2012 12:40:15 +0000 (14:40 +0200)
commit27e351f9ce2d981dc9b6aee95fbea0b404f59e9d
treeab3ab37904c30167deecbd7f4eb80d37f63d6192
parent3e93b71d6650d62e65f7a6a1beab9a7a28a454e8
parent966343f41ed08a79f4e646743000fb1fee3f0a63
Merge tag 'upstream/1.8'

Upstream version 1.8