Merge tag 'upstream/1.6'
authorgregor herrmann <gregoa@debian.org>
Wed, 2 May 2012 16:30:47 +0000 (18:30 +0200)
committergregor herrmann <gregoa@debian.org>
Wed, 2 May 2012 16:30:47 +0000 (18:30 +0200)
commitf6c5f1e118ca40ea5a9f5d39bd861a64fa5a3673
tree207568d6efee73eed1b6b30b60f57b752a91a3fb
parent8bac02bf07867e3873a3c099a7e77cdcba2d8775
parent34fafe2f105bd63e59ba11a46af63242a2091e39
Merge tag 'upstream/1.6'

Upstream version 1.6