Merge tag 'upstream/0.9.4+r4182.20130608'
authorgregor herrmann <gregoa@debian.org>
Sat, 8 Jun 2013 15:34:22 +0000 (17:34 +0200)
committergregor herrmann <gregoa@debian.org>
Sat, 8 Jun 2013 15:34:22 +0000 (17:34 +0200)
commit34534fdd439ad927a06a722cf32977d0ca56af9d
treef198ec7df41b8c0fe7dbb34041816fffe3160700
parent51ba08c5ccb1c42cd6539b2676d3a9556fbe21f6
parentd59d9e46e9b5d1e7ede3bab788f1e8992793401e
Merge tag 'upstream/0.9.4+r4182.20130608'

Upstream version 0.9.4+r4182.20130608