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

[git at git.haskell.org]

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

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

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

commit a7f1bb90beb44a0bb665f74629137ef5721c07bb
Merge: d43b9bd 1408c8d
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Tue Nov 4 17:24:50 2014 +0000

    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 a7f1bb90beb44a0bb665f74629137ef5721c07bb