Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Thu, 14 Jun 2012 11:46:48 +0000 (12:46 +0100)
committerIan Lynagh <igloo@earth.li>
Thu, 14 Jun 2012 11:46:48 +0000 (12:46 +0100)
commit0f3d8ab9f8c174f9aba5764a6b1edaf2c873b8c6
tree495a31e7dbb51aa89a9103d62ca12e4475cf6c15
parent82a8ffd8179e0f99271a608e52f083d7a09d24ee
parent1e9a2d34ae6996b6872ee4cc87bc8218360fcaf9
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc