Merge tag 'upstream/0.9.8'
authorSven Hoexter <sven@timegate.de>
Sun, 12 Aug 2012 17:16:47 +0000 (19:16 +0200)
committerSven Hoexter <sven@timegate.de>
Sun, 12 Aug 2012 17:16:47 +0000 (19:16 +0200)
Upstream version 0.9.8


Trivial merge