Marc Delisle 269d0c89fe Fix merge conflicts

2013-07-28 06:17:38 -04:00

..

authentication.inc.php

…

musbe-ca.crt

…

swekey.auth.lib.php

Fix merge conflicts

2013-07-28 06:17:38 -04:00

swekey.php

many some minor fixes (sorry, see diff)

2013-01-26 15:35:29 +03:00