Merge "upd: modified text displayed during certificate creation process"

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

Wed, 14 Sep 2016 19:44:56 +0000 (21:44 +0200)

committer Gerrit Code Review <gigi-system@dogcraft.de>

Wed, 14 Sep 2016 19:44:56 +0000 (21:44 +0200)
author Felix Dörre <felix@dogcraft.de>
Wed, 14 Sep 2016 19:44:56 +0000 (21:44 +0200)
committer Gerrit Code Review <gigi-system@dogcraft.de>
Wed, 14 Sep 2016 19:44:56 +0000 (21:44 +0200)
diff --cc src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
Simple merge
author	Felix Dörre <felix@dogcraft.de>
	Wed, 14 Sep 2016 19:44:56 +0000 (21:44 +0200)
committer	Gerrit Code Review <gigi-system@dogcraft.de>
	Wed, 14 Sep 2016 19:44:56 +0000 (21:44 +0200)