Merge branch 'release' of ssh://git-cacert.it-sls.de/var/cache/git/cacert-devel into...
authorBenny Baumann <BenBE@geshi.org>
Tue, 16 Jul 2013 21:31:41 +0000 (23:31 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 16 Jul 2013 21:31:41 +0000 (23:31 +0200)

Trivial merge