add news item for git-annex 3.20111107

2 files changed, 8 insertions, 10 deletions

diff --git a/doc/news/version_3.20110915.mdwn b/doc/news/version_3.20110915.mdwn
deleted file mode 100644
index 77a97242d..000000000
--- a/doc/news/version_3.20110915.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-git-annex 3.20110915 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * whereis: Show untrusted locations separately and do not include in
-     location count.
-   * Fix build without S3.
-   * addurl: Always use whole url as destination filename, rather than
-     only its file component.
-   * get, drop, copy: Added --auto option, which decides whether
-     to get/drop content as needed to work toward the configured numcopies.
-   * bugfix: drop and fsck did not honor --exclude"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20111107.mdwn b/doc/news/version_3.20111107.mdwn
new file mode 100644
index 000000000..17431bf21
--- /dev/null
+++ b/doc/news/version_3.20111107.mdwn
@@ -0,0 +1,8 @@
+git-annex 3.20111107 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * merge: Use fast-forward merges when possible.
+     Thanks Valentin Haenel for a test case showing how non-fast-forward
+     merges could result in an ongoing pull/merge/push cycle.
+   * Don't try to read config from repos with annex-ignore set.
+   * Bugfix: In the past two releases, git-annex init has written the uuid.log
+     in the wrong format, with the UUID and description flipped."""]]
\ No newline at end of file