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

[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/1c877aa89595d8d6e30f2673e8031d23cdeabdfa/ghc

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

commit 1c877aa89595d8d6e30f2673e8031d23cdeabdfa
Merge: 4a90b33 e9013dc
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Jan 16 18:10:49 2016 +0000

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



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

1c877aa89595d8d6e30f2673e8031d23cdeabdfa
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)