Tim Almdal 0a6b540092 Merge branch 'master' into talmdal_dev ...

Conflicts:
	modules/server_add/helpers/server_add_theme.php

2009-10-24 07:28:22 -07:00

..

admin_users.php

Merge branch 'master' into talmdal_dev

2009-10-24 07:28:22 -07:00

password.php

move controllers and views to the user module to make the Identity Provider refactor smaller

2009-10-23 09:23:02 -07:00

users.php

Merge branch 'master' into talmdal_dev

2009-10-24 07:28:22 -07:00