[commit: packages/Cabal] ghc-head: Merge pull request #1361 from tarleb/agpl (e13e58d)

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

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

commit e13e58df7ce816d0aeb56ecb2a02467bfafe3938
Merge: d9b40dc dba536f
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Thu Jun 6 07:20:51 2013 -0700

    Merge pull request #1361 from tarleb/agpl
    
    Add support for GNU AGPLv3 license (AGPL-3)



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

e13e58df7ce816d0aeb56ecb2a02467bfafe3938
 Cabal/Distribution/License.hs                      |    8 +-
 Cabal/Distribution/PackageDescription/Check.hs     |    5 +-
 cabal-install/Distribution/Client/Init.hs          |    7 +-
 cabal-install/Distribution/Client/Init/Licenses.hs |  666 ++++++++++++++++++++
 4 files changed, 682 insertions(+), 4 deletions(-)