[commit: haddock] wip/ast-prepare-annotations-final3: Merge remote-tracking branch 'haskell/wip/ast-prepare-annotations-final3' into wip/ast-prepare-annotations-final3 (fa621a6)

[git at git.haskell.org]

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

On branch  : wip/ast-prepare-annotations-final3
Link       : http://git.haskell.org/haddock.git/commitdiff/fa621a64af55724e7ec6b044e786b8dd497a2a2a

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

commit fa621a64af55724e7ec6b044e786b8dd497a2a2a
Merge: 044ac2a e3f9cf9
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Tue Nov 18 21:52:17 2014 +0200

    Merge remote-tracking branch 'haskell/wip/ast-prepare-annotations-final3' into wip/ast-prepare-annotations-final3



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

fa621a64af55724e7ec6b044e786b8dd497a2a2a