Merge tag 'upstream/0.9.4+r4182.20140204'
authorgregor herrmann <gregoa@debian.org>
Thu, 6 Feb 2014 16:39:33 +0000 (17:39 +0100)
committergregor herrmann <gregoa@debian.org>
Thu, 6 Feb 2014 16:39:33 +0000 (17:39 +0100)
commit1abe0e38c4aec72c65b57fa924b9bddcf52a929a
tree87eb34c68cb9853147f5b01545083829b52e6e75
parentc255e24b184bdb2e24b5cdf7111284845e18da7b
parent05282ffb3e094fa7577a98e86f4ea2569ccffd86
Merge tag 'upstream/0.9.4+r4182.20140204'

Upstream version 0.9.4+r4182.20140204