Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Thu, 25 Oct 2012 17:12:41 +0000 (18:12 +0100)
committerIan Lynagh <ian@well-typed.com>
Thu, 25 Oct 2012 17:12:41 +0000 (18:12 +0100)
commit93d45391dc9b5dcc53d8b34c914a033d3362ccef
treec8ed398350f0af481000e6f8f5dc089c47093779
parentf3115bdda03288960d28541562ce3fc8d9b623b8
parentc588395719241c4b5756bd8d60dbf822915dfc5b
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc