[commit: ghc] wip/generics-propeq: Merge branch 'master' into wip/generics-propeq (5f003d2)

[git at git.haskell.org]

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

On branch  : wip/generics-propeq
Link       : http://ghc.haskell.org/trac/ghc/changeset/5f003d228340c3ce8e500f9053f353c58dc1dc94/ghc

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

commit 5f003d228340c3ce8e500f9053f353c58dc1dc94
Merge: ff9c557 dff0623
Author: Gabor Greif <ggreif at gmail.com>
Date:   Fri Aug 8 18:01:19 2014 +0200

    Merge branch 'master' into wip/generics-propeq
    
    Conflicts:
    	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 5f003d228340c3ce8e500f9053f353c58dc1dc94