Christophe Vilayphiou 308cfc7cf2 Merge branch 'design_team' into ldap ...

Conflicts:
	app/views/devise/sessions/new.html.erb

2012-04-24 02:46:06 +08:00

..

built_in_modules

Merge branch 'design_team' into ldap

2012-04-24 02:46:06 +08:00

plugins

Merge with sub_roles

2011-12-23 18:34:21 +08:00