[commit: ghc] wip/GenericsMetaData: Merge branch 'wip/new-flatten-skolems-Oct14' into wip/GenericsMetaData (7dba4dc)

[git at git.haskell.org]

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

On branch  : wip/GenericsMetaData
Link       : http://ghc.haskell.org/trac/ghc/changeset/7dba4dc7eabaeb3f93c31f7a31dd68cb3e7a16c1/ghc

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

commit 7dba4dc7eabaeb3f93c31f7a31dd68cb3e7a16c1
Merge: 50e56bc 78a0fcb
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Mon Nov 3 22:30:29 2014 +0000

    Merge branch 'wip/new-flatten-skolems-Oct14' into wip/GenericsMetaData
    
    Conflicts:
    	compiler/typecheck/TcDeriv.lhs
    	compiler/typecheck/TcGenGenerics.lhs



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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 7dba4dc7eabaeb3f93c31f7a31dd68cb3e7a16c1