[commit: ghc] wip/T5462: Merge branch 'master' into wip/T5462 (d43b9bd)

[git at git.haskell.org]

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

On branch  : wip/T5462
Link       : http://ghc.haskell.org/trac/ghc/changeset/d43b9bd62f54c0d64d29c506f2dd43395bb42760/ghc

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

commit d43b9bd62f54c0d64d29c506f2dd43395bb42760
Merge: 7a4cdef 3567207
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Fri Oct 3 14:22:32 2014 +0100

    Merge branch 'master' into wip/T5462



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


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 d43b9bd62f54c0d64d29c506f2dd43395bb42760