[commit: ghc] wip/nfs-locking: Merge branch 'master' of https://github.com/snowleopard/hadrian (f8bd794)

[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/f8bd7949c12c99aae2b6d0388fdf3b6d9143d23e/ghc

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

commit f8bd7949c12c99aae2b6d0388fdf3b6d9143d23e
Merge: e561f80 cb5035a
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu Mar 16 00:42:05 2017 +0000

    Merge branch 'master' of https://github.com/snowleopard/hadrian



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

f8bd7949c12c99aae2b6d0388fdf3b6d9143d23e
 .travis.yml | 10 ++++++++--
 README.md   |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)