http-conduit
Merge remote-tracking branch 'origin/master'

Conflicts:
	haskell-trello.cabal
Merge remote-tracking branch 'origin/master'