[commit: packages/Cabal] ghc-head: Merge changes from GHC HQ fork (c977ddd)

[git at git.haskell.org]

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

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=c977ddd0439aa0bb035f6b5fc87f3b0598208499

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

commit c977ddd0439aa0bb035f6b5fc87f3b0598208499
Merge: 830b16a 5fa5c41
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Mon Aug 26 15:14:00 2013 -0230

    Merge changes from GHC HQ fork
    
    Conflicts:
    	Cabal/Cabal.cabal



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

c977ddd0439aa0bb035f6b5fc87f3b0598208499
 Cabal/Language/Haskell/Extension.hs |    5 +++++
 1 file changed, 5 insertions(+)