add news item for git-annex 5.20140709

2 files changed, 11 insertions, 21 deletions

diff --git a/doc/news/version_5.20140517.mdwn b/doc/news/version_5.20140517.mdwn
deleted file mode 100644
index fc0d2bbd4..000000000
--- a/doc/news/version_5.20140517.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-git-annex 5.20140517 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * webapp: Switched to bootstrap 3.
-     Thanks, Sören Brunk.
-   * Standalone builds now check gpg signatures before upgrading.
-   * Simplified repository description line format. The remote name,
-     if any, is always in square brackets after the description.
-   * assistant: Clean up stale tmp files on startup.
-   * webapp: Better ssh password prompting.
-   * Depend on git-remote-gcrypt 0.20130908-6. Older versions
-     fail when the assistant is run with no controlling tty.
-   * Added ddar special remote.
-     Thanks, Robie Basak.
-   * webapp: Fixed drag and drop to reorder the list of remotes.
-   * group: When no groups are specified to set, lists the current groups
-     of a repository.
-   * Add remote.$name.annex-shell configuration.
-     Thanks, Fraser Tweedale
-   * Support symlinking git-annex and git-annex-shell
-     from the Linux standalone bundle into PATH.
-     Thanks, jlebar."""]]
\ No newline at end of file
diff --git a/doc/news/version_5.20140709.mdwn b/doc/news/version_5.20140709.mdwn
new file mode 100644
index 000000000..963d7131c
--- /dev/null
+++ b/doc/news/version_5.20140709.mdwn
@@ -0,0 +1,11 @@
+git-annex 5.20140709 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix race in direct mode merge code that could cause all files in the
+     repository to be removed. It should be able to recover repositories
+     experiencing this bug without data loss. See:
+     http://git-annex.branchable.com/bugs/bad\_merge\_commit\_deleting\_all\_files/
+   * Fix git version that supported --no-gpg-sign.
+   * Fix bug in automatic merge conflict resolution, when one side is an
+     annexed symlink, and the other side is a non-annexed symlink.
+   * Really fix bug that caused the assistant to make many unncessary
+     empty merge commits."""]]
\ No newline at end of file