[commit: ghc] master: Merge branch 'master' of git://git.haskell.org/ghc (a07ff3b)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a07ff3b0051b2607ef87d4601362e57798107ce4/ghc

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

commit a07ff3b0051b2607ef87d4601362e57798107ce4
Merge: 3a0019e 2ff68c3
Author: Iavor S. Diatchki <diatchki at galois.com>
Date:   Thu Mar 19 14:35:30 2015 -0700

    Merge branch 'master' of git://git.haskell.org/ghc



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

a07ff3b0051b2607ef87d4601362e57798107ce4
 libraries/Win32                    | 2 +-
 libraries/base/GHC/Conc/Windows.hs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)