On Windows, use `TransliterateCodingFailure` for encoding on `stdout`
and `stderr` (unless the current locale encoding is already a Unicode
encoding, in which case do nothing.)
Relaxed error handling requires base >= 4.4; fix build for GHC <= 7.0.4.
Forgot to conditionally omit all the relevant imports in the previous
commit; oops.
Again, fix on GHC 7.0.4, hopefully.
Remove redundant line. (Churn to prod Travis CI.)
Bump version number of both lib and exe to 1.20.0
Require at least HTTP-4000.2.5

Prior versions didn't include an upper bound on network and might
therefore cause build failures as the relativeTo function was changed
in network-2.4.0.0.
Use 1.20.0.0 instead of 1.20.0 as the version number
Fix broken links to bootstrap.sh

Additionally, add links to Haskell Platform and Cabal library README. Excise some verbiage.
Merge pull request #1779 from ianbollinger/patch-1

Fix broken links to bootstrap.sh
Fix typo in HTTP upper bound
More diff friendly pretty printing of cabal files

Added the new field constructor functions 'listFieldWithSep'
and 'commaListFieldWithSep' to be able to define pretty printing
for fields, where each value of the field is positioned on a new line.

Which fields are nested is currently hard coded in the 'ppField' function.
Update bootstrap.sh.

(cherry picked from commit a63871b7ed005fae265a9e8517e51c346e8c6b5a)

Conflicts:
	cabal-install/bootstrap.sh
More diff friendly pretty printing of cabal files

Added the new field constructor functions 'listFieldWithSep'
and 'commaListFieldWithSep' to be able to define pretty printing
for fields, where each value of the field is positioned on a new line.

Which fields are nested is currently hard coded in the 'ppField' function.

(cherry picked from commit e8d5ea254ab2ed037819bcd094146062ecca7a0b)
Add changelog for Cabal-1.20.0.0
Add changelog for cabal-install-1.20.0.0
Revert "Add cabal exec"

This reverts commit 99d912d321a750739475412c4510075675b2b91b.

Looks like Johan managed to botch a merge somehow, see #1786. Or maybe that was
a bug on the GitHub side.
prototype of "cabal exec", missing GHC_PACKAGE_PATH support

Conflicts:
	cabal-install/Main.hs
Set GHC_PACKAGE_PATH in cabal exec

Uses a hardcoded path for the sandbox and also includes both the global and
user package databases, but ending with a `:`.
Calculate sandbox package DB correctly