Merge branch 'master' of ssh://git-cacert.it-sls.de/var/cache/git/cacert-mgr
authorMarkus Warg <mw@it-sls.de>
Thu, 22 Apr 2010 09:43:06 +0000 (11:43 +0200)
committerMarkus Warg <mw@it-sls.de>
Thu, 22 Apr 2010 09:43:06 +0000 (11:43 +0200)

Trivial merge