Merge tag 'upstream/0.9.4+r4180.20120502'
authorgregor herrmann <gregoa@debian.org>
Wed, 2 May 2012 15:04:57 +0000 (17:04 +0200)
committergregor herrmann <gregoa@debian.org>
Wed, 2 May 2012 15:04:57 +0000 (17:04 +0200)
commit9c5d963e1dd8ea7bab7c1f9f15c926554a7bf2f9
treea5df5433f37908bfcf40e6c4278ee392cc543551
parent66777b053af90e4d9447628c34336b6bad7d6a33
parent6698b3802d1197c706ebfaac68481eb1749d14d5
Merge tag 'upstream/0.9.4+r4180.20120502'

Upstream version 0.9.4+r4180.20120502