Merge branch 'stable'

README.org

@@ -93,6 +93,14 @@ You can also find this example in the source distribution in the ~Examples/~ fol
 
 ** 0.7 series
 
+- 0.7.5
+  - Support for http-conduit 1.7 and 1.8
+
+- 0.7.1-0.7.4
+  - Support for GHC 7.6
+  - Wider constraints to support newer versions of various dependencies
+  - Update maintainer e-mail address and project categories in cabal file
+
 - 0.7.0
   - Change ServiceConfiguration concept so as to indicate in the type whether this is for URI-only requests
     (i.e. awsUri)

aws.cabal

@@ -1,5 +1,5 @@
 Name:                aws
-Version:             0.7.2
+Version:             0.7.5
 Synopsis:            Amazon Web Services (AWS) for Haskell
 Description:         Bindings for Amazon Web Services (AWS), with the aim of supporting all AWS services. To see a high level overview of the library, see the README at <https://github.com/aristidb/aws/blob/master/README.org>.
 Homepage:            http://github.com/aristidb/aws
@@ -20,7 +20,7 @@ Cabal-version:       >=1.10
 Source-repository this
   type: git
   location: https://github.com/aristidb/aws.git
-  tag: 0.7.2
+  tag: 0.7.5
 
 Source-repository head
   type: git
@@ -120,8 +120,8 @@ Executable GetObject
     Build-depends:
                        base == 4.*,
                        aws,
-                       http-conduit >= 1.6 && < 1.7,
-                       conduit >= 0.5 && < 0.6
+                       http-conduit,
+                       conduit
 
   Default-Language: Haskell2010