[commit: ghc] wip/nfs-locking: Merge remote-tracking branch 'snowleopard/master' into angerman/feature/advanced-render-box (ee95b14)

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

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

commit ee95b14e13491cc42329afed8ae038e9e94527cb
Merge: ade3088 2024396
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Fri Jan 15 15:59:02 2016 +0800

    Merge remote-tracking branch 'snowleopard/master' into angerman/feature/advanced-render-box
    
    # Conflicts:
    #	src/Base.hs



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

ee95b14e13491cc42329afed8ae038e9e94527cb
 .appveyor.yml                |   1 +
 .travis.yml                  |   1 +
 cfg/system.config.in         |   6 ++-
 src/Builder.hs               |   2 +
 src/Rules/Actions.hs         |  11 ++++-
 src/Rules/Gmp.hs             | 101 ++++++++++++++++++++++++-------------------
 src/Rules/Library.hs         |   6 ++-
 src/Settings/Builders/Ghc.hs |  11 ++++-
 8 files changed, 89 insertions(+), 50 deletions(-)