9 files changed, 37 insertions, 11 deletions
diff --git a/Utility/Process.hs b/Utility/Process.hs
index a98d04df5..3a8677fa3 100644
--- a/Utility/Process.hs
+++ b/Utility/Process.hs
@@ -296,16 +296,6 @@ showCmd = go . cmdspec
 	go (ShellCommand s) = s
 	go (RawCommand c ps) = c ++ " " ++ show ps
 
-{- Wrappers for System.Process functions that do debug logging.
- - 
- - More could be added, but these are the only ones I usually need.
- -}
-
-createProcess :: CreateProcess -> IO (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle)
-createProcess p = do
-	debugProcess p
-	System.Process.createProcess p
-
 {- Starts an interactive process. Unlike runInteractiveProcess in
  - System.Process, stderr is inherited. -}
 startInteractiveProcess
@@ -322,3 +312,9 @@ startInteractiveProcess cmd args environ = do
 		}
 	(Just from, Just to, _, pid) <- createProcess p
 	return (pid, to, from)
+
+{- Wrapper around System.Process function that does debug logging. -}
+createProcess :: CreateProcess -> IO (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle)
+createProcess p = do
+	debugProcess p
+	System.Process.createProcess p
diff --git a/debian/changelog b/debian/changelog
index 92e5ab503..e18da6522 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ git-annex (4.20130628) UNRELEASED; urgency=low
     git-annex-shell.
   * OSX Mountain Lion: Fixed gpg bundled in dmg to not fail due to a missing
     gpg-agent.
+  * Android: gpg is built without --enable-minimal, so it interoperates
+    better with other gpg builds that may default to using other algorithms
+    for encryption.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jul 2013 15:40:55 -0400
 
diff --git a/doc/bugs/Can__39__t_set_repositories_directory.mdwn b/doc/bugs/Can__39__t_set_repositories_directory.mdwn
index bbc5bd638..f1ce5dea5 100644
--- a/doc/bugs/Can__39__t_set_repositories_directory.mdwn
+++ b/doc/bugs/Can__39__t_set_repositories_directory.mdwn
@@ -10,3 +10,6 @@ At beginning during the webapp installation
 user error (git ["--git-dir=/Users/filippo/Desktop/annex/.git","--work-tree=/Users/filippo/Desktop/annex","commit-tree","4b825dc642cb6eb9a060e54bf8d69288fbee4904"] exited 128)
 
 [[!tag moreinfo assistant]]
+
+> [[done]]; based on the comment, this was a broken git email issue, which
+> git-annex now works around. --[[Joey]]
diff --git a/doc/bugs/gpg_error_on_android.mdwn b/doc/bugs/gpg_error_on_android.mdwn
index 42f083015..3e69f05f2 100644
--- a/doc/bugs/gpg_error_on_android.mdwn
+++ b/doc/bugs/gpg_error_on_android.mdwn
@@ -34,3 +34,6 @@ gpg: decryption failed: secret key not available
 
 # End of transcript or log.
 """]]
+
+> [[done]]; I have deployed the new gpg build for Android and the
+> nightly Android app build is now using it. --[[Joey]]
diff --git a/doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn b/doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn
index 1bcd37369..471c91e9d 100644
--- a/doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn
+++ b/doc/bugs/make_install_doesn__39__t_create_git-annex-shell.mdwn
@@ -58,3 +58,5 @@ rsync error: error in rsync protocol data stream (code 12) at io.c(605) [sender=
 
 # End of transcript or log.
 """]]
+
+[[!tag done]]
diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn
index c288b71de..e4e3c2222 100644
--- a/doc/walkthrough.mdwn
+++ b/doc/walkthrough.mdwn
@@ -15,6 +15,7 @@ A walkthrough of the basic features of git-annex.
 	walkthrough/modifying_annexed_files
 	walkthrough/using_ssh_remotes
 	walkthrough/moving_file_content_between_repositories
+	walkthough/using_tags_and_branches
 	walkthrough/unused_data
 	walkthrough/fsck:_verifying_your_data
 	walkthrough/fsck:_when_things_go_wrong
diff --git a/doc/walkthrough/syncing.mdwn b/doc/walkthrough/syncing.mdwn
index 38f0f8acc..3c43e502c 100644
--- a/doc/walkthrough/syncing.mdwn
+++ b/doc/walkthrough/syncing.mdwn
@@ -23,3 +23,7 @@ remotes, where a sync will get them. This is especially useful when using
 git in a distributed fashion, without a 
 [[central bare repository|tips/centralized_git_repository_tutorial]]. See
 [[sync]] for details.
+
+Note that syncing only syncs the metadata about your files that is stored
+in git. It does not sync the contents of files, that are managed by
+git-annex.
diff --git a/doc/walkthrough/using_tags_and_branches.mdwn b/doc/walkthrough/using_tags_and_branches.mdwn
new file mode 100644
index 000000000..06f021472
--- /dev/null
+++ b/doc/walkthrough/using_tags_and_branches.mdwn
@@ -0,0 +1,14 @@
+Like git, git-annex hangs on to every old version of a file, so you can
+make tags and branches, and can check them out later to look at the old
+files.
+
+	# git tag 1.0
+	# rm -f my_cool_big_file
+	# git commit -m deleted
+	# git checkout 1.0
+	# cat my_cool_big_file
+	yay! old version still here
+
+Of course, when you `git checkout` an old branch, some old versions of
+files may not be locally available, and may be stored in some other
+repository. You can use `git annex get` to get them as usual.
diff --git a/standalone/android/Makefile b/standalone/android/Makefile
index 50d32f3e8..39b8df054 100644
--- a/standalone/android/Makefile
+++ b/standalone/android/Makefile
@@ -114,7 +114,7 @@ $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync/build-stamp: rsync.patch
 $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg/build-stamp:
 	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg && git checkout gnupg-1.4.13
 	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg && ./autogen.sh
-	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg && ./configure --host=arm-linux-androideabi --disable-gnupg-iconv --enable-minimal --disable-card-support --disable-agent-support --disable-photo-viewers --disable-keyserver-helpers --disable-nls
+	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg && ./configure --host=arm-linux-androideabi --disable-gnupg-iconv --disable-card-support --disable-agent-support --disable-photo-viewers --disable-keyserver-helpers --disable-nls
 	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/gnupg; $(MAKE) || true # expected failure in doc build
 	touch $@