[commit: packages/Cabal] ghc-head: Merge branch 'master' of https://github.com/hvr/cabal (bd967b2)

[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=bd967b22f1e2eed2220634fb2eb65cb53c1c57cc

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

commit bd967b22f1e2eed2220634fb2eb65cb53c1c57cc
Merge: 272a5c2 b269701
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Mon Aug 26 13:44:10 2013 -0230

    Merge branch 'master' of https://github.com/hvr/cabal



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

bd967b22f1e2eed2220634fb2eb65cb53c1c57cc
 Cabal/Distribution/Simple/GHC.hs         |    1 +
 Cabal/Distribution/Simple/Program/GHC.hs |    4 ++++
 2 files changed, 5 insertions(+)