Michael Snoyman 24e8e53f64 Merge remote-tracking branch 'origin/master' into persistent2-simpler-dispatch ... Conflicts: .gitignore yesod-core/yesod-core.cabal		2014-03-20 04:14:09 +02:00
..
Auth	Merge remote-tracking branch 'origin/master' into persistent2-simpler-dispatch	2014-03-20 04:14:09 +02:00
Auth.hs	Merge remote-tracking branch 'origin/master' into persistent2-simpler-dispatch	2014-03-20 04:14:09 +02:00