[commit: haddock] T6018-injective-type-families, adamse-D1033, ghc-head, wip/10268, wip/10313, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T9840, wip/orf-reboot: Reset ghc-head with master's tree (3c191ef)

[git at git.haskell.org]

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

On branches: T6018-injective-type-families,adamse-D1033,ghc-head,wip/10268,wip/10313,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/3c191ef6ef857c92b9962a72731482fb29ddfb7f

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

commit 3c191ef6ef857c92b9962a72731482fb29ddfb7f
Merge: 7c7468c b94ab90
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 22 17:46:37 2014 +0100

    Reset ghc-head with master's tree
    
    (this is an overwriting git merge of master into ghc-head)



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

3c191ef6ef857c92b9962a72731482fb29ddfb7f