Merge tag 'upstream/1.3.0'

Upstream version 1.3.0

# gpg: Unterschrift vom Sa 01 Jun 2013 01:14:40 CEST mittels RSA-Schlüssel ID 25771B31
# gpg: Korrekte Unterschrift von "Mike Gabriel <mike.gabriel@das-netzwerkteam.de>"
# gpg:                     alias "Mike Gabriel <mike@zaubberer.net>"
# gpg:                     alias "Mike Gabriel <mga@informatik.uni-kiel.de>"
# gpg:                     alias "Mike Gabriel <mike.gabriel@sunweavers.net>"
# gpg:                     alias "Mike Gabriel <mike.gabriel@moonweavers.net>"
# gpg:                     alias "Mike Gabriel <mike.gabriel@ubuntu.de>"
# gpg:                     alias "Mike Gabriel <mike.gabriel@it-zukunft-schule.de>"
# gpg:                     alias "Mike Gabriel <m.gabriel@das-netzwerkteam.de>"
# gpg:                     alias "Mike Gabriel <mike@ubuntu.de>"
# gpg:                     alias "Mike Gabriel <mike@moonweavers.net>"
# gpg:                     alias "Mike Gabriel <sunweaver@debian.org>"