Merge tag 'upstream/0.9.4+r4180.20120803'
authorgregor herrmann <gregoa@debian.org>
Fri, 3 Aug 2012 15:13:04 +0000 (17:13 +0200)
committergregor herrmann <gregoa@debian.org>
Fri, 3 Aug 2012 15:13:04 +0000 (17:13 +0200)
commit042eaf35211522ddf61337400d95568dcdf9eec5
tree86b89a53184225e759eb8c4ff06fa74d6a6036c9
parentc858d70dc23d4bc211f7e047bd84ec3b3630ef42
parentc3267c06f6a235a9a53d750daa96b0b626c9cede
Merge tag 'upstream/0.9.4+r4180.20120803'

Upstream version 0.9.4+r4180.20120803