[commit: ghc] wip/nfs-locking: Merge pull request #150 from snowleopard/angerman-patch-1 (754ed41)

[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/754ed41f02f404dc0b735df8f48e855a12f2248f/ghc

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

commit 754ed41f02f404dc0b735df8f48e855a12f2248f
Merge: 24e6c28 55b0d41
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Jan 11 03:31:50 2016 +0000

    Merge pull request #150 from snowleopard/angerman-patch-1
    
    Update Setting.hs



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

754ed41f02f404dc0b735df8f48e855a12f2248f
 src/Oracles/Config/Setting.hs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)