https://github.com/atyndall/rubycas-server/commit/054f219e0dd544392c913597c1f0275ac7c85af2
Merge branch 'master' of github.com:unihallresclub/rubycas-server

Conflicts:
	lib/casserver/authenticators/remote_devise.rb