Merge branch 'master' of github.com:yesodweb/authenticate

.travis.yml

@@ -0,0 +1,8 @@
+language: haskell
+
+install:
+    - cabal update
+    - cabal install mega-sdist hspec cabal-meta cabal-src
+    - cabal-meta install --force-reinstalls
+
+script: mega-sdist --test

authenticate/authenticate.cabal

@@ -1,5 +1,5 @@
 name:            authenticate
-version:         1.3.1.1
+version:         1.3.2
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Hiromi Ishii, Arash Rouhani
@@ -18,7 +18,7 @@ homepage:        http://github.com/yesodweb/authenticate
 library
     build-depends:   base                          >= 4        && < 5
                    , aeson                         >= 0.5
-                   , http-conduit                  >= 1.5      && < 1.7
+                   , http-conduit                  >= 1.5      && < 1.9
                    , tagsoup                       >= 0.12     && < 0.13
                    , transformers                  >= 0.1      && < 0.4
                    , bytestring                    >= 0.9

sources.txt

@@ -0,0 +1 @@
+./authenticate