Merge branch 'felix-work'
authorFelix Dörre <felix@dogcraft.de>
Sun, 1 Feb 2015 01:46:44 +0000 (02:46 +0100)
committerFelix Dörre <felix@dogcraft.de>
Sun, 1 Feb 2015 01:46:44 +0000 (02:46 +0100)
commita1a980dd0cc65f33a6189eb81a164fe79abb647c
tree023a670ae13ffc84b434b3975a000483413e505d
parent8a3ba6314f9b33e720212c4d44d67a7a8d84bcf0
parent8af6231b22da4fef795bcb54913faad6592b1a02
Merge branch 'felix-work'
src/org/cacert/gigi/dbObjects/User.java