Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Sat, 14 Jul 2012 15:07:51 +0000 (16:07 +0100)
committerIan Lynagh <igloo@earth.li>
Sat, 14 Jul 2012 15:07:51 +0000 (16:07 +0100)
commit58b96047fefcda4a72d8f07823cce9ea8b6ad98a
tree5507d2ef2b3455cf2b8b93584f0a98c39293a382
parent6c00355911d1b4710e25348b79436d03d2d3911f
parentc1f01e351759e7c25818b05e32bdb7b702dac6f2
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc