Changes to haddock(4)

Changes to haddock:
commit aaa00e86b224125aaa2d7d16bddb78c75103bff4
Merge: 87a6eed 32c6be7
Author: Herbert Valerio Riedel <hvr@gnu.org>
Date:   Wed Jun 25 11:49:34 2014 +0200

    Merge branch 'v2.14' into ghc-7.8

commit 32c6be75514af7dd0093d9b83cd3d720dc342165
Author: Herbert Valerio Riedel <hvr@gnu.org>
Date:   Wed Jun 25 11:48:20 2014 +0200

    Revert "Follow change in patSynSig"

    This reverts commit e811b00837d19340047ad83273b4aa2dc2534dd8.
    since the respective change isn't in GHC 7.8.3 yet

commit 9427cb0aa7e80420a07b8792fc6d6cdb6610a03e
Author: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date:   Wed Jun 25 10:18:57 2014 +0200

    Fix anchors. Closes #308.

commit e811b00837d19340047ad83273b4aa2dc2534dd8
Author: Simon Peyton Jones <simonpj@microsoft.com>
Date:   Fri Jun 6 11:33:09 2014 +0100

    Follow change in patSynSig

    Conflicts:
    	src/Haddock/Convert.hs