Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Tue, 23 Oct 2012 19:16:24 +0000 (20:16 +0100)
committerIan Lynagh <ian@well-typed.com>
Tue, 23 Oct 2012 19:16:24 +0000 (20:16 +0100)
commita58b2d02e8c9b1ad9d630f6d0e0e01781aa2e278
tree13d5d657c846a2051c3cd6a13d314219d716598e
parenta5bf0d5a1cf3fc1baa31cf08d2dec83d316a63c2
parent88a6f863d9f127fc1b03a1e2f068fd20ecbe096c
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc