[SCM] branch, master, updated. debian/0.20-1-9-gbe25bd3

[gregor herrmann]

The following commit has been merged in the master branch:
commit 0b84972a5a01d0e2f3937c26f761bf09a184c879
Merge: 96f6a7996b93d73a69815c0814e6cd8ec78e0966 7e9d955f60a3f50ce4a4a109efda6733b1d156e1
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Mar 2 20:54:38 2013 +0100

    Merge tag 'upstream/0.22'
    
    Upstream version 0.22


--