Merge branch 'master' of http://git.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 7 Oct 2014 07:03:58 +0000 (08:03 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 7 Oct 2014 07:03:58 +0000 (08:03 +0100)
commit85aba4961a533bfb3f26314d854de19b781093ac
treed4de40fdc986c9304d2620b89012c1ee31395bde
parent48089ccf4f1f239b3268b2cb52b8aa0f7356485b
parent6ecf19c61221bddf5df3ee54f24daa90c91bdd71
Merge branch 'master' of git.haskell.org/ghc