Merge branch 'bug-918' of ssh://git-cacert.it-sls.de/var/cache/git/cacert-devel into...
authorMichael Tänzer <neo@nhng.de>
Sun, 10 Apr 2011 23:39:58 +0000 (01:39 +0200)
committerMichael Tänzer <neo@nhng.de>
Sun, 10 Apr 2011 23:39:58 +0000 (01:39 +0200)

Trivial merge