[SCM] branch, master, updated. debian/0.17-1-17-g9b3641d

[gregor herrmann]

The following commit has been merged in the master branch:
commit 99d5d7d3ef6d0421f46e8c5079a75e3eef5cfd54
Merge: 3bf34070616439cb201faf0cb1a918bf018ae5c3 274aad6d161080633221f243ec282cbb8f79565a
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Feb 17 19:13:29 2013 +0100

    Merge tag 'upstream/0.20'
    
    Upstream version 0.20


--