Christophe Vilayphiou f950f77f36 Merge branch 'design_team' into ldap ...

Conflicts:
	Gemfile
	app/models/ad_banner.rb

2012-05-15 23:02:22 +08:00

..

built_in_modules

Merge branch 'design_team' into ldap

2012-05-15 23:02:22 +08:00

impressionist

Add vendor/impressionist

2012-05-15 22:42:49 +08:00

plugins

Merge with sub_roles

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