yesod/yesod-auth/Yesod/Auth
Michael Snoyman 67ae9c739b Merge commit 'e4e2dd75cc86909d66062a7655b8cbc3a959932d'
Conflicts:
	yesod-auth/Yesod/Auth.hs
	yesod-auth/Yesod/Auth/BrowserId.hs
	yesod-auth/Yesod/Auth/Dummy.hs
	yesod-auth/Yesod/Auth/Email.hs
	yesod-auth/Yesod/Auth/HashDB.hs
	yesod-auth/Yesod/Auth/OpenId.hs
	yesod-auth/Yesod/Auth/Rpxnow.hs
	yesod-form/Yesod/Form/Fields.hs
	yesod-form/Yesod/Form/Functions.hs
	yesod-form/Yesod/Form/Jquery.hs
	yesod-form/Yesod/Form/Nic.hs
	yesod-form/Yesod/Helpers/Crud.hs
	yesod-newsfeed/Yesod/AtomFeed.hs
	yesod-newsfeed/Yesod/RssFeed.hs
2012-03-25 11:07:12 +02:00
..
BrowserId.hs Merge commit 'e4e2dd75cc86909d66062a7655b8cbc3a959932d' 2012-03-25 11:07:12 +02:00
Dummy.hs Merge commit 'e4e2dd75cc86909d66062a7655b8cbc3a959932d' 2012-03-25 11:07:12 +02:00
Email.hs Merge commit 'e4e2dd75cc86909d66062a7655b8cbc3a959932d' 2012-03-25 11:07:12 +02:00
GoogleEmail.hs Merge commit 'e4e2dd75cc86909d66062a7655b8cbc3a959932d' 2012-03-25 11:07:12 +02:00
HashDB.hs Merge commit 'e4e2dd75cc86909d66062a7655b8cbc3a959932d' 2012-03-25 11:07:12 +02:00
Message.hs germanMessage added to the export list 2012-02-29 12:28:57 +01:00
OpenId.hs Merge commit 'e4e2dd75cc86909d66062a7655b8cbc3a959932d' 2012-03-25 11:07:12 +02:00
Rpxnow.hs Merge commit 'e4e2dd75cc86909d66062a7655b8cbc3a959932d' 2012-03-25 11:07:12 +02:00