[commit: xhtml] master: Merge branch 'master' of github.com:haskell/xhtml (e6dc0c8)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/xhtml

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e6dc0c800f5a1c3ac8f0fcb477b2d76394c30d38

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

commit e6dc0c800f5a1c3ac8f0fcb477b2d76394c30d38
Merge: 808a5af... 040f951...
Author: Chris Dornan <chris at chrisdornan.com>
Date:   Fri Feb 3 13:23:30 2012 +0000

    Merge branch 'master' of github.com:haskell/xhtml

 xhtml.cabal |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --cc xhtml.cabal
index 3f821d6,62abc92..72a4d1c
--- a/xhtml.cabal
+++ b/xhtml.cabal
@@@ -18,10 -18,10 +18,10 @@@ Cabal-version:      >= 1.
  
  Source-repository head
      type:           git
-     location:       git at github.com:haskell/xhtml.git
+     location:       https://github.com/haskell/xhtml
  
  library 
 -    Build-depends:  base >= 4.0 && < 4.6
 +    Build-depends:  base >= 4.0 && < 5.0
      Exposed-modules: 
                      Text.XHtml, 
                      Text.XHtml.Frameset,