Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Tue, 9 Oct 2012 11:33:00 +0000 (12:33 +0100)
committerIan Lynagh <ian@well-typed.com>
Tue, 9 Oct 2012 11:33:00 +0000 (12:33 +0100)
commitef786b6cbc5f67a673bf8c10be5311317c1e7b88
treecc60a496523999be41783a0b251ad825780183c3
parent879aae15043a071942bc95dbae163fd7d17cabe5
parentcc2a4d57692ccd40bd552cccbcec15b7d5c97746
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc