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
..
panel/announcement	Merge branch 'design_team' into ldap	2012-04-24 02:46:06 +08:00
.gitkeep	merge with master	2012-01-11 20:31:52 +08:00