Merge remote-tracking branch 'origin/master' into staging

This commit is contained in:
Eelco Dolstra
2014-07-14 17:04:55 +02:00
1429 changed files with 4283 additions and 353 deletions

View File

@@ -1,3 +1,5 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text