Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Fri, 20 Jul 2012 18:17:09 +0000 (19:17 +0100)
committerIan Lynagh <igloo@earth.li>
Fri, 20 Jul 2012 18:17:09 +0000 (19:17 +0100)
commita0ba88bef62af0e7f91720ac6ad71850078fd718
tree3d444ac64c7153eaf451ac8e81c4f6e90c33e7bd
parent2844abb416975d589ab598162e70eff0df49751f
parentcfb038de5df3fd2521987c143b3e5257d5d20055
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc