[commit: haddock] overlapping-tyfams: Merge branch 'master' of http://darcs.haskell.org/haddock (4a15d90)

[Richard Eisenberg]

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

On branch  : overlapping-tyfams

http://hackage.haskell.org/trac/ghc/changeset/4a15d90b840c2a79c010a61a4cafae8169b5ae22

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

commit 4a15d90b840c2a79c010a61a4cafae8169b5ae22
Merge: eccf268... 336e635...
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Thu Jun 20 16:36:59 2013 +0100

    Merge branch 'master' of http://darcs.haskell.org/haddock

 .ghci                   |    2 +-
 html-test/ref/Bug8.html |    6 +++---
 html-test/run.lhs       |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)