[commit: haddock] overlapping-tyfams: Merge commit '8bdd26' into overlapping-tyfams (cdfe4fd)

[Richard Eisenberg]

Repository : ssh://darcs.haskell.org//srv/darcs/haddock

On branch  : overlapping-tyfams

http://hackage.haskell.org/trac/ghc/changeset/cdfe4fd4a86ab6abb920eed8eadf98af2ca1888c

>---------------------------------------------------------------

commit cdfe4fd4a86ab6abb920eed8eadf98af2ca1888c
Merge: 8d3c11a... 8bdd26e...
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri May 24 23:50:42 2013 +0100

    Merge commit '8bdd26' into overlapping-tyfams