Merge branch 'master' of /home/b-git-annex/source

3 files changed, 14 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index 517cf5969..7251ab665 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-git-annex (0.20110326) UNRELEASED; urgency=low
+git-annex (0.20110328) experimental; urgency=low
 
   * annex.diskreserve can be given in arbitrary units (ie "0.5 gigabytes")
   * Generalized remotes handling, laying groundwork for remotes that are
-    not regular git remotes.
+    not regular git remotes. (Think Amazon S3.)
   * Provide a less expensive version of `git annex copy --to`, enabled
     via --fast. This assumes that location tracking information is correct,
     rather than contacting the remote for every file.
@@ -10,7 +10,7 @@ git-annex (0.20110326) UNRELEASED; urgency=low
     v1 git-annex-shell. This results in some oddly named keys in the v1
     annex. Recognise and fix those keys when upgrading, instead of crashing.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 26 Mar 2011 14:36:16 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 28 Mar 2011 10:47:29 -0400
 
 git-annex (0.20110325) experimental; urgency=low
 
diff --git a/doc/news/version_0.20110328.mdwn b/doc/news/version_0.20110328.mdwn
new file mode 100644
index 000000000..512ce4647
--- /dev/null
+++ b/doc/news/version_0.20110328.mdwn
@@ -0,0 +1,11 @@
+git-annex 0.20110328 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * annex.diskreserve can be given in arbitrary units (ie "0.5 gigabytes")
+   * Generalized remotes handling, laying groundwork for remotes that are
+     not regular git remotes. (Think Amazon S3.)
+   * Provide a less expensive version of `git annex copy --to`, enabled
+     via --fast. This assumes that location tracking information is correct,
+     rather than contacting the remote for every file.
+   * Bugfix: Keys could be received into v1 annexes from v2 annexes, via
+     v1 git-annex-shell. This results in some oddly named keys in the v1
+     annex. Recognise and fix those keys when upgrading, instead of crashing."""]]
\ No newline at end of file
diff --git a/doc/news/version_0.24.mdwn b/doc/news/version_0.24.mdwn
deleted file mode 100644
index 81b013a26..000000000
--- a/doc/news/version_0.24.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-Branched the 0.24 series, which will be maintained for a while (in the
-stable branch in git) to support v1 git-annex repos, while main development
-moves to the 0.2011 series, with v2 git-annex repos.
-
-git-annex 0.24 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-* Add Suggests on graphviz. Closes: #[618039](http://bugs.debian.org/618039)
-* When adding files to the annex, the symlinks pointing at the annexed
-  content are made to have the same mtime as the original file.
-  While git does not preserve that information, this allows a tool
-  like metastore to be used with annexed files.
-  (Currently this is only done on systems supporting POSIX 200809.)"""]]