Merge tag 'upstream/0.5.5'
authorgregor herrmann <gregoa@debian.org>
Wed, 13 Jun 2012 15:21:41 +0000 (17:21 +0200)
committergregor herrmann <gregoa@debian.org>
Wed, 13 Jun 2012 15:21:41 +0000 (17:21 +0200)
commit083696de73de3435a59aa6f9a0077ce7cc8723d5
treee2e782f60d2106ac6f8aecf138758863dfd4484d
parent8cf4df68435e524d15d5da4b54baeec59c0b6f91
parent3cd43ad7eb88909514f0a35974511edc29ffc643
Merge tag 'upstream/0.5.5'

Upstream version 0.5.5