Merge changes I82859d98,I3da54fbf
authorFelix Dörre <felix@dogcraft.de>
Tue, 2 Aug 2016 11:50:24 +0000 (13:50 +0200)
committerGerrit Code Review <gigi-system@dogcraft.de>
Tue, 2 Aug 2016 11:50:24 +0000 (13:50 +0200)
commit557a8a2e5f395400467459f003956bf7660cc044
treef9184914eb4e0b2bbe145985b782663c7d8c7e15
parentd0ee991d9ba982e43acd036c2d0592976ba9e9ff
parent5c61e5186caa42e0543e1a349b6b416f07c3dbc4
Merge changes I82859d98,I3da54fbf

* changes:
  upd: fix some wording
  upd: replace assure, assurance, assurer etc in output to user
src/org/cacert/gigi/dbObjects/User.java