Merge branch 'master' into s3-aws

Conflicts:
	git-annex.cabal

debian/changelog

@@ -31,6 +31,19 @@ git-annex (5.20140718) UNRELEASED; urgency=medium
     due to the nature of bup.
   * unlock: Better error handling; continue past files that are not available
     or cannot be unlocked due to disk space, and try all specified files.
+  * Windows: Now uses actual inode equivilants in new direct mode
+    repositories, for safer detection of eg, renaming of files with the same
+    size and mtime.
+  * direct: Fix ugly warning messages.
+  * WORM backend: When adding a file in a subdirectory, avoid including the
+    subdirectory in the key name.
+  * S3, Glacier, WebDAV: Fix bug that prevented accessing the creds
+    when the repository was configured with encryption=shared embedcreds=yes.
+  * direct: Avoid leaving file content in misctemp if interrupted.
+  * git-annex-shell sendkey: Don't fail if a remote asks for a key to be sent
+    that already has a transfer lock file indicating it's being sent to that
+    remote. The remote may have moved between networks, or reconnected.
+  * Switched from the old haskell HTTP library to http-conduit.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2014 14:41:26 -0400
 

debian/control

@@ -16,8 +16,6 @@ Build-Depends:
 	libghc-aws-dev,
 	libghc-conduit-dev,
 	libghc-resourcet-dev,
-	libghc-http-conduit-dev,
-	libghc-http-client-dev,
 	libghc-dav-dev (>= 1.0) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc],
 	libghc-quickcheck2-dev,
 	libghc-monad-control-dev (>= 0.3),
@@ -50,6 +48,7 @@ Build-Depends:
 	libghc-dns-dev,
 	libghc-case-insensitive-dev,
 	libghc-http-types-dev,
+	libghc-http-conduit-dev,
 	libghc-blaze-builder-dev,
 	libghc-crypto-api-dev,
 	libghc-network-multicast-dev,
@@ -59,7 +58,6 @@ Build-Depends:
 	libghc-gnutls-dev (>= 0.1.4),
 	libghc-xml-types-dev,
 	libghc-async-dev,
-	libghc-http-dev,
 	libghc-feed-dev (>= 0.3.9.2),
 	libghc-regex-tdfa-dev [!mipsel !s390],
 	libghc-regex-compat-dev [mipsel s390],