Merge branch 'master' into nightly

This commit is contained in:
Jens Petersen 2016-05-18 19:00:06 +09:00
commit 37f7eb4b1f

View File

@ -2800,6 +2800,9 @@ expected-test-failures:
# https://github.com/stbuehler/haskell-nettle/issues/8
- nettle
# https://github.com/fpco/stackage/issues/1459
- twitter-conduit
# end of expected-test-failures
# Benchmarks which are known not to build. Note that, currently we do not run