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

[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/382ecb4b36b9e06dc5f3875a7cc8aeb287623696/ghc

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

commit 382ecb4b36b9e06dc5f3875a7cc8aeb287623696
Merge: 44d81b0 b6f3045
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Dec 26 14:43:49 2015 +0000

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



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

382ecb4b36b9e06dc5f3875a7cc8aeb287623696
 LICENSE   | 2 ++
 README.md | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)