Merge branch 'master' of ssh://git-cacert.it-sls.de/var/cache/git/cacert-mgr
authorMichael Tänzer <neo@nhng.de>
Tue, 3 Aug 2010 19:31:41 +0000 (21:31 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 3 Aug 2010 19:31:41 +0000 (21:31 +0200)

Trivial merge