Ping Yu 087c3f8b3c Merge branch 'master' of github.com:intridea/omniauth ... Conflicts: .gitignore		2010-10-18 16:44:46 -05:00
..
strategies	Merge branch 'master' of github.com:intridea/omniauth	2010-10-18 16:44:46 -05:00
enterprise.rb	adding ldap authentication for oa-enterprise gem	2010-10-01 20:48:13 -05:00