Merge tag 'upstream/0.9.4+r4180.20130204'
authorgregor herrmann <gregoa@debian.org>
Tue, 5 Feb 2013 16:03:47 +0000 (17:03 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 5 Feb 2013 16:03:47 +0000 (17:03 +0100)
commit8fe95234f55c1a6adf6a8ab4430a0b821d39dc34
tree4c994762abf1112502896a22e9965442b25cba72
parent3ba79d2975c69d0b29762d63e23de7d0c900da00
parenta2632d6f0db82a343419adccc02f16e84f8bce11
Merge tag 'upstream/0.9.4+r4180.20130204'

Upstream version 0.9.4+r4180.20130204