[commit: ghc] wip/ext-solver: Merge branch 'master' into wip/ext-solver (5246346)

[git at git.haskell.org]

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

On branch  : wip/ext-solver
Link       : http://ghc.haskell.org/trac/ghc/changeset/524634641c61ab42c555452f6f87119b27f6c331/ghc

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

commit 524634641c61ab42c555452f6f87119b27f6c331
Merge: 79ad1d2 c41b716
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sat Jul 19 14:29:57 2014 -0700

    Merge branch 'master' into wip/ext-solver



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


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 524634641c61ab42c555452f6f87119b27f6c331