Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Thu, 26 Apr 2012 18:45:11 +0000 (19:45 +0100)
committerIan Lynagh <igloo@earth.li>
Thu, 26 Apr 2012 18:45:11 +0000 (19:45 +0100)
commitb643fe08b3c083fd23889ed9413a01928779a9e8
tree334f23b417c639ad9f2f11529617cc286f38f902
parent9f611ccc52afc979535a27e7e954caa9e0b9a5e7
parent5bfd8933024cb2120c38e01346b1b47d6dde10cb
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc