[commit: ghc] wip/nfs-locking: Merge pull request #34 from bgamari/master (20b4c08)

[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/20b4c080dedd0fd6c1ce6a7d9b8543b8c97cf82e/ghc

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

commit 20b4c080dedd0fd6c1ce6a7d9b8543b8c97cf82e
Merge: 013fa90 263fc63
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Dec 24 12:33:42 2015 +0000

    Merge pull request #34 from bgamari/master
    
    Expression: Add Haddocks



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

20b4c080dedd0fd6c1ce6a7d9b8543b8c97cf82e
 src/Expression.hs | 88 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 36 deletions(-)