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

[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/30a3d9199fe606b08b26b387bc9b8b932dc2098d/ghc

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

commit 30a3d9199fe606b08b26b387bc9b8b932dc2098d
Merge: a8ea524 497f750
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Jan 22 13:08:56 2016 +0000

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



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

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