Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Sat, 13 Oct 2012 13:45:12 +0000 (14:45 +0100)
committerIan Lynagh <ian@well-typed.com>
Sat, 13 Oct 2012 13:45:12 +0000 (14:45 +0100)
commit56a2003a5f5196f81abb3ad2459a386be83d13f2
treeacc2871dd0eb45c9eda4c1444c1f5f213ca35c86
parent83f5c6c69ceeff6cb6ca8d56dfad79c5e126a130
parent4780cbc13de5d527f481f7d78a46d9515378e1b5
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc