[commit: ghc] master: Merge branch 'master' of git://git.haskell.org/ghc (5c89f88)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5c89f8802e8e1e1398705fcaf22f1af3ad24304a/ghc

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

commit 5c89f8802e8e1e1398705fcaf22f1af3ad24304a
Merge: 63e1f09 7ac600d
Author: Sjoerd Visscher <sjoerd at w3future.com>
Date:   Fri Jun 6 14:31:51 2014 +0200

    Merge branch 'master' of git://git.haskell.org/ghc
    
    Conflicts:
    	docs/users_guide/flags.xml



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


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 5c89f8802e8e1e1398705fcaf22f1af3ad24304a