Merge tag 'upstream/0.20'
authorChris Butler <chrisb@debian.org>
Sun, 17 Mar 2013 13:21:34 +0000 (13:21 +0000)
committerChris Butler <chrisb@debian.org>
Sun, 17 Mar 2013 13:21:34 +0000 (13:21 +0000)
Upstream version 0.20

# gpg: Unterschrift vom So 17 Mär 2013 13:21:28 GMT mittels RSA-Schlüssel ID 49E3ACD3
# gpg: Korrekte Unterschrift von "Chris Butler <chrisb@crustynet.org.uk>"
# gpg:                     alias "Chris Butler <chrisb@debian.org>"


Trivial merge