Test Distribution.Client.Dependency.Modular.PSQ.splits with QuickCheck
Merge branch 'fast-splits' of https://github.com/nomeata/cabal
Comment.
Grammar.
Update build-depends for ghc-7.7.x
Remove unused ScopedTypeVariables
Merge pull request #1205 from benmachine/unnecessary-pragma

Remove unused ScopedTypeVariables
Update time to 1.4.0.2 in bootstrap.sh
Merge pull request #1208 from alexanderkjeldaas/master

Update time version
Merge pull request #1203 from tuncer/ghc-7.7

Update build-depends for ghc-7.7.x
Remove flags for unsupported compilers from Cabal.cabal
Merge pull request #1209 from benmachine/oldbuildflags

Remove flags for unsupported compilers from Cabal.cabal
Update references to bugtracker

To reflect the move from hackage trac to github issues. Note that the
issue numbers don't quite line up.
Don't pretty-print unparseable test suite types.

Issue #1202. The pretty printer was printing 'type: -' for empty test
suite interfaces.  The empty test interface type is the result of
parsing a branch in a conditional block where no type is explicitly
specified (i.e., the type is inherited from a higher level or propagated
up from a lower one).  Therefore, the pretty-printer should not print
any 'type' field at all for test suites with an empty test interface
type.
Merge branch 'parse-pp-ident-1202' of https://github.com/ttuegel/cabal
Add pretty-printing of benchmarks
Don't initialise cabal.sandbox.config from ~/.cabal/config.

Reverts fada98e2d0d2fdda36476befdf4e9176f3e40dc7.
Refactoring.

Remove the confusing 'basePkgEnv' function, make loading the inherited package
environment more explicit.
Rename 'userPkgEnv' to 'userPackageEnvironment'.
Make 'createPackageEnvironment' return '()'.

Removes a bit of duplication.