[SCM] branch, master, updated. debian/0.20-1-6-g96f6a79

[gregor herrmann]

The following commit has been merged in the master branch:
commit c50e72f4c40fa232c0a609cfc91d6ec8a8eb4aa9
Merge: 9b3641df3d91ed07e53e78e567cb46611e6d5153 0606e796d3b4c6012a2c08268fe3d4f265a4535e
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Feb 24 17:18:05 2013 +0100

    Merge tag 'upstream/0.21'
    
    Upstream version 0.21


--