Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Sun, 5 Aug 2012 12:35:34 +0000 (13:35 +0100)
committerIan Lynagh <ian@well-typed.com>
Sun, 5 Aug 2012 12:35:34 +0000 (13:35 +0100)
commit89900ff3096f34f1212dfe2b1dfd32adf5b3bf1b
tree8b2984afae6f59958d24f230d3e35159e05dc7a8
parent6f346d4d03ccc36fba85ffec14c09cc804a29285
parent7974afb348f7bb89ce1ec3dd909884f5c674f044
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc