aboutsummaryrefslogtreecommitdiff
path: root/doc/news/version_3.20120825.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-27 13:31:54 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-27 13:31:54 -0400
commitb12db9ef9214d801280310222fc5e9d16f8af3de (patch)
tree161aea0e484d014ddc1d1c8430037829debdbb5d /doc/news/version_3.20120825.mdwn
parent347d3892e7b7897f696268a162e8638b12612f31 (diff)
parentd228e4ca8c5b9ed88fe6b30ada12e822f847f58d (diff)
Merge branch 'master' into assistant
Conflicts: debian/changelog Updated changelog for assistant and webapp
Diffstat (limited to 'doc/news/version_3.20120825.mdwn')
-rw-r--r--doc/news/version_3.20120825.mdwn6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/news/version_3.20120825.mdwn b/doc/news/version_3.20120825.mdwn
new file mode 100644
index 000000000..8cc45e1b1
--- /dev/null
+++ b/doc/news/version_3.20120825.mdwn
@@ -0,0 +1,6 @@
+git-annex 3.20120825 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * S3: Add fileprefix setting.
+ * Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt.
+ * Bugfix: Fix fsck in SHA*E backends, when the key contains composite
+ extensions, as added in 3.20120721."""]] \ No newline at end of file