Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Fri, 23 Nov 2012 18:04:14 +0000 (18:04 +0000)
committerIan Lynagh <ian@well-typed.com>
Fri, 23 Nov 2012 18:04:14 +0000 (18:04 +0000)
commit464646dcfacead2dc9569cba524bf2a6af4c3388
tree7da366be3bdf18ec34e940c5a0f6a63cc9cd2a2e
parent39f273709488ec609b25320c10f2fc7b5f7518de
parente1dbabbf979cd05723e7ea5c2a2e856ce35d3168
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc