fay 0.12
Merge branch 'master' into with-fay-base

Conflicts:
	yesod-fay.cabal