From 748e403fedf6e1c1f27114149e1cce61725ef36e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 Nov 2014 14:38:51 -0400
Subject: [PATCH] add changelog entires for when this branch gets merged

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index efaba2d950..b57ca66789 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+  * S3: Switched to using the haskell aws library.
+  * S3: No longer buffers entire files in memory when uploading without
+    chunking.
+  * S3: When built with a new enough version of the haskell aws library,
+    supports doing multipart uploads, in order to store extremely large
+    files in S3 when not using chunking.
+
 git-annex (5.20141025) UNRELEASED; urgency=medium
 
   * Windows: Fix crash when user.name is not set in git config.