Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 19 Apr 2013 09:22:49 +0000 (10:22 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 19 Apr 2013 09:22:49 +0000 (10:22 +0100)
commit24ffa317d2c34698fabe9d55387eb1b67c52bd0a
tree772894b4538a2578220830cc7f9e63ce83318528
parentda651729d8721b259dc934ab9e3f6b0d47eb0f38
parent87baa31cb117181ab4f4b26387653996d1792167
Merge branch 'master' of darcs.haskell.org/ghc