Merge branch 'release' of ssh://git-cacert.it-sls.de/var/cache/git/cacert-devel into...
authorBernhard Froehlich <ted@convey.de>
Mon, 29 Aug 2011 18:47:49 +0000 (20:47 +0200)
committerBernhard Froehlich <ted@convey.de>
Mon, 29 Aug 2011 18:47:49 +0000 (20:47 +0200)

Trivial merge