Merge commit '0176ca7cda25ad88e9faa116ffa139ca926de273' into HEAD

author Felix Dörre <felix@dogcraft.de>

Thu, 7 Apr 2016 11:59:33 +0000 (13:59 +0200)

committer Felix Dörre <felix@dogcraft.de>

Thu, 7 Apr 2016 11:59:33 +0000 (13:59 +0200)
author Felix Dörre <felix@dogcraft.de>
Thu, 7 Apr 2016 11:59:33 +0000 (13:59 +0200)
committer Felix Dörre <felix@dogcraft.de>
Thu, 7 Apr 2016 11:59:33 +0000 (13:59 +0200)
diff --cc util-testing/org/cacert/gigi/pages/Manager.templ
Simple merge
author	Felix Dörre <felix@dogcraft.de>
	Thu, 7 Apr 2016 11:59:33 +0000 (13:59 +0200)
committer	Felix Dörre <felix@dogcraft.de>
	Thu, 7 Apr 2016 11:59:33 +0000 (13:59 +0200)