Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <ian@well-typed.com>
Wed, 3 Jul 2013 12:59:59 +0000 (13:59 +0100)
committerIan Lynagh <ian@well-typed.com>
Wed, 3 Jul 2013 12:59:59 +0000 (13:59 +0100)
commit606ec0a1749399d9085444362b7203b4e96e0530
tree34573439f9749e45572799786c558f63dec78368
parentc548fec4f11920244e81b9f83ebb2aaf7d08ba40
parentfdc3761834185c38dcec1faedabe08065bd66bed
Merge branch 'master' of darcs.haskell.org/ghc