Michael Snoyman a486a2f71d Merge branch 'rebuild-for-shakespeare' ... Conflicts: yesod/scaffold/project.cabal.cg yesod/yesod.cabal		2012-11-07 09:59:37 +02:00
..
Default	Merge branch 'rebuild-for-shakespeare'	2012-11-07 09:59:37 +02:00