Merge branch 'master' into ghc7.10

This commit is contained in:
Michael Snoyman 2015-04-30 07:42:07 +03:00
commit c7a48ba9dd

View File

@ -1259,9 +1259,6 @@ expected-test-failures:
- hedis
- redis-io
# https://github.com/twittner/swagger/issues/3
- swagger
# Haddocks which are expected to fail. Same concept as expected test failures.
expected-haddock-failures:
# https://github.com/acw/bytestring-progress/issues/4