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

[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/950ac6b7dc479aebfc367db3c459130cb71668e0/ghc

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

commit 950ac6b7dc479aebfc367db3c459130cb71668e0
Merge: c50799d acf3623
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Mar 10 12:37:03 2016 +0000

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



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

950ac6b7dc479aebfc367db3c459130cb71668e0
 README.md | 2 ++
 1 file changed, 2 insertions(+)