Merge branch 'master' of ssh://git-annex.branchable.com

doc/Android/comment_1_cc9caa5dd22dd67e5c1d22d697096dd2._comment

@@ -0,0 +1,15 @@
+[[!comment format=txt
+ username="http://yarikoptic.myopenid.com/"
+ nickname="site-myopenid"
+ subject="Does it require the device to be rooted?"
+ date="2013-05-16T20:55:45Z"
+ content="""
+Following your news on kickstarter downloaded the .apk, and installed it.  Upn start I just got a terminal window with
+
+  link busybox: Read-only file system
+
+  [Terminal session finished]
+
+That is on Galaxy Note
+
+"""]]

doc/bugs/adding_an_rsync.net_repo_give_an_gpg_error.mdwn

@@ -0,0 +1,20 @@
+### Please describe the problem.
+adding an rsync.net repo returns an internal server error "user error (gpg ["--quite","--trust-model","always","--gen-random","--armor","1","512"] exited 127)
+
+
+### What steps will reproduce the problem?
+add an rsync.net repo
+
+
+### What version of git-annex are you using? On what operating system?
+4.20130516-g8a26544 for OSX Mountain Lion
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/debug.log
+
+
+# End of transcript or log.
+"""]]

doc/design/assistant/blog/day_264__Windows_second_stage_complete/comment_4_9ce106baf28b7f75f7f6febd7bfcea70._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
+ nickname="Jimmy"
+ subject="comment 4"
+ date="2013-05-16T17:31:40Z"
+ content="""
+joey, I'll poke at it on the weekend, been meaning to look for an excuse to learn a bit more about buildbot.
+"""]]