yesod/yesod-auth/Yesod
Greg Weber b1cdf072ad Merge branch 'master' into auth-json-2
Conflicts:
	yesod-auth/Yesod/Auth.hs
	yesod-auth/Yesod/Auth/Email.hs
	yesod-auth/yesod-auth.cabal
2014-03-20 14:38:14 -07:00
..
Auth Merge branch 'master' into auth-json-2 2014-03-20 14:38:14 -07:00
Auth.hs Merge branch 'master' into auth-json-2 2014-03-20 14:38:14 -07:00