Merge branch 'master' into windows

debian/changelog

@@ -6,6 +6,8 @@ git-annex (4.20130502) UNRELEASED; urgency=low
   * git-annex-shell: Ensure that received files can be read. Files
     transferred from some Android devices may have very broken permissions
     as received.
+  * direct mode: Direct mode commands now work on files staged in the index,
+    they do not need to be committed to git.
   * Temporarily add an upper bound to the version of yesod that can be built
     with, since yesod 1.2 has a great many changes that will require extensive
     work on the webapp.
@@ -24,6 +26,7 @@ git-annex (4.20130502) UNRELEASED; urgency=low
     the destination's default file permissions, as the local ones can
     be arbitrarily broken. (Ie, ----rwxr-x for files on Android)
   * migrate: Detect if a file gets corrupted while it's being migrated.
+  * Debian: Add a menu file.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 02 May 2013 20:39:19 -0400
 

debian/menu

@@ -0,0 +1,2 @@
+?package(git-annex):needs="X11" section="Applications/Network" \
+	title="git-annex assistant" command="git annex webapp"