Merge branch 'master' into ghc7.10

Conflicts:
	build-constraints.yaml
This commit is contained in:
Michael Snoyman 2015-04-30 13:18:08 +03:00
commit 2aa04fe655

View File

@ -778,8 +778,10 @@ packages:
"Leon Mergen leon@solatis.com @solatis": "Leon Mergen leon@solatis.com @solatis":
- base58string - base58string
- bitcoin-block
- bitcoin-script - bitcoin-script
- bitcoin-tx - bitcoin-tx
- bitcoin-types
- hexstring - hexstring
- network-attoparsec - network-attoparsec
- network-anonymous-i2p - network-anonymous-i2p