Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Thu, 23 Aug 2012 16:05:13 +0000 (17:05 +0100)
committerIan Lynagh <ian@well-typed.com>
Thu, 23 Aug 2012 16:05:13 +0000 (17:05 +0100)
commitcc1cc09dbd5625b6d1c05bb878b8ad1767cb9780
tree4611f0e25d0d11b09a63ef82a70b7e22ace1cb6e
parent0440d8af7837f905734368c239f11ae3b442ec0b
parent336a7698927ccf5f278b2fed56664f13169dbc65
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc