[commit: ghc] wip/nfs-locking: Merge pull request #11 from bgamari/master (5c42b58)

[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/5c42b582cb8c05741cc5be87dd3ec2f935997f56/ghc

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

commit 5c42b582cb8c05741cc5be87dd3ec2f935997f56
Merge: 821d9e9 c84445f
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Dec 20 20:15:12 2015 +0000

    Merge pull request #11 from bgamari/master
    
    Fix fallout from previous refactoring



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

5c42b582cb8c05741cc5be87dd3ec2f935997f56
 src/GHC.hs   | 2 +-
 src/Rules.hs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)