[commit: ghc] wip/nfs-locking: Merge pull request #162 from ndmitchell/master (6934485)

[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/6934485f0e98b62630ce0d867ebc6b8f3da5f04a/ghc

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

commit 6934485f0e98b62630ce0d867ebc6b8f3da5f04a
Merge: f5f6c41 a60cdcd
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Jan 13 09:15:24 2016 +0000

    Merge pull request #162 from ndmitchell/master
    
    #155, fix the name of the QuickCheck package [skip ci]



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

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