Merge tag 'upstream/0.11'
authorChris Butler <chrisb@debian.org>
Wed, 14 Nov 2012 20:39:59 +0000 (20:39 +0000)
committerChris Butler <chrisb@debian.org>
Wed, 14 Nov 2012 20:39:59 +0000 (20:39 +0000)
Upstream version 0.11
# gpg: Unterschrift vom Mi 14 Nov 2012 20:39:45 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