Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
This commit is contained in:
chris 2012-11-22 21:11:57 +08:00
commit cad03a70d5

Diff Content Not Available