Merge branch 'master' into fileField

This commit is contained in:
Michael Snoyman 2012-11-09 12:24:51 +02:00
commit d5b7a1f8bf

View File

@ -42,7 +42,7 @@ test-suite runtests
, yesod-routes
, text >= 0.5 && < 0.12
, HUnit >= 1.2 && < 1.3
, hspec >= 1.3 && < 1.4
, hspec >= 1.3
, containers
, template-haskell
, path-pieces