Matt Fu 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap ...

Conflicts:
	config/environments/development.rb

2012-03-01 10:13:49 +08:00

..

built_in_modules

Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap

2012-03-01 10:13:49 +08:00

plugins

Merge with sub_roles

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