Merge branch 'master' into yesod-1.4

Conflicts:
	yesod-core/yesod-core.cabal
This commit is contained in:
Michael Snoyman 2014-09-23 10:00:24 +03:00
commit 29894604e5

View File

@ -36,7 +36,7 @@ library
, transformers >= 0.2.2
, mtl
, clientsession >= 0.9 && < 0.10
, random >= 1.0.0.2 && < 1.1
, random >= 1.0.0.2 && < 1.2
, cereal >= 0.3
, old-locale >= 1.0.0.2 && < 1.1
, containers >= 0.2