[commit: haddock] ghc-7.8, wip/pattern-synonym-sig-backport: Merge branch 'v2.14' into ghc-7.8 (fdaec65)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branches: ghc-7.8,wip/pattern-synonym-sig-backport
Link       : http://git.haskell.org/haddock.git/commitdiff/fdaec6541b57da79c5b52a002e5eb7bc623523bb

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

commit fdaec6541b57da79c5b52a002e5eb7bc623523bb
Merge: aaa00e8 60aa88e
Author: Austin Seipp <aseipp at pobox.com>
Date:   Thu Jul 3 17:22:35 2014 -0500

    Merge branch 'v2.14' into ghc-7.8



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

fdaec6541b57da79c5b52a002e5eb7bc623523bb
 src/Haddock/Convert.hs          |  4 ++--
 src/Haddock/Interface/Create.hs | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)