[commit: ghc] wip/orf-reboot: Merge branch 'wip/orf-reboot' of git://git.haskell.org/ghc into wip/orf-reboot (4986d6a)

[git at git.haskell.org]

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

On branch  : wip/orf-reboot
Link       : http://ghc.haskell.org/trac/ghc/changeset/4986d6a41036860bb492999f21ae4fee9effe8bc/ghc

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

commit 4986d6a41036860bb492999f21ae4fee9effe8bc
Merge: 094c9e1 3f7494e
Author: Adam Gundry <adam at well-typed.com>
Date:   Tue Jul 7 16:20:00 2015 +0100

    Merge branch 'wip/orf-reboot' of git://git.haskell.org/ghc into wip/orf-reboot



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

4986d6a41036860bb492999f21ae4fee9effe8bc
 compiler/basicTypes/FieldLabel.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)