Marc Delisle 90d968b447 Fix merge conflicts		2013-07-17 15:18:09 -04:00
..
authentication.inc.php	plugins and OOP: import XML, export and import SQL; auth structure	2012-05-28 00:59:49 +03:00
musbe-ca.crt	plugins and OOP: import XML, export and import SQL; auth structure	2012-05-28 00:59:49 +03:00
swekey.auth.lib.php	Fix merge conflicts	2013-07-17 15:18:09 -04:00
swekey.php	many some minor fixes (sorry, see diff)	2013-01-26 15:35:29 +03:00