[commit: ghc] wip/nfs-locking: Merge branch 'master' of github.com:snowleopard/shaking-up-ghc (7be13bf)

[git at git.haskell.org]

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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/7be13bfa70a63ff190245cbfc6779e675e5d6816/ghc

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

commit 7be13bfa70a63ff190245cbfc6779e675e5d6816
Merge: 8b24f9f 52b915f
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Feb 7 12:30:56 2016 +0000

    Merge branch 'master' of github.com:snowleopard/shaking-up-ghc



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

7be13bfa70a63ff190245cbfc6779e675e5d6816
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)