Merge remote-tracking branch 'orca/android-rebuild' into android-rebuild

doc/bugs/OSX_app_issues/comment_13_cb12d419459e5cac766022ee0697fedc._comment

@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="John"
+ ip="109.242.130.160"
+ subject="runshell typo prevents execution"
+ date="2013-09-22T00:24:10Z"
+ content="""
+Using the latest Mountain Lion build available.
+
+>$ /Applications/git-annex.app/Contents/MacOS/git-annex
+
+>/Applications/git-annex.app/Contents/MacOS/runshell: line 25: syntax error near unexpected token `&'
+
+Line 25:
+>echo \"** runshell loop detected!\"> &2
+
+Fix (obvious but for the sake of completeness):
+>echo \"** runshell loop detected!\" >&2
+"""]]

doc/bugs/OSX_app_issues/comment_14_c966fa549bc73c52034ac9abc49de52a._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.154.1.250"
+ subject="comment 14"
+ date="2013-09-22T14:15:28Z"
+ content="""
+I have fixed the runshell typo and updated the builds.
+"""]]

doc/forum/Syncing_with_an_encrypted_remote_from_a_different_computer__63__.mdwn

@@ -0,0 +1,4 @@
+I created an "full archive" repo on my local pc and an encrypted "full backup" repo on Box.com. I 'm copying files on the local repo and they are getting encrypted and uploaded to Box. Superb so far :)
+
+What I am wondering though is, suppose my local pc dies. How do I get the data out of Box unencrypted from a new pc?
+

doc/tips/using_gitolite_with_git-annex/comment_14_7d4d4515218d1259d32be3baeb5ee56e._comment

@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkSbvo_NbY-ev1VKtzwo7nEqUmvRO6rXGA"
+ nickname="François"
+ subject="comment 14"
+ date="2013-09-22T18:30:45Z"
+ content="""
+@khaije
+
+Could you paste your config file? Here is mine: http://paste.debian.net/44856/
+I don't have any COMMANDS array. Could you elaborate your modifications please?
+
+Thanks.
+"""]]

standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch

@@ -0,0 +1,25 @@
+From eff7034f0c9f80fd30c9d8952b3fd0a343adccc8 Mon Sep 17 00:00:00 2001
+From: foo <bar>
+Date: Mon, 23 Sep 2013 00:12:35 +0000
+Subject: [PATCH] hack for Bionic
+
+---
+ cbits/conv.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cbits/conv.c b/cbits/conv.c
+index 7ff7b87..2e4c870 100644
+--- a/cbits/conv.c
++++ b/cbits/conv.c
+@@ -55,7 +55,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) {
+ #else
+     strptime(src, fmt, &dst);
+ #endif
+-    return timegm(&dst);
++    return NULL; /* timegm(&dst); (not in Bionic) */
+ }
+ 
+ size_t c_format_unix_time(char *fmt, time_t src, char* dst, int siz) {
+-- 
+1.7.10.4
+

standalone/android/install-haskell-packages

@@ -58,6 +58,7 @@ install_pkgs () {
 	cd tmp
 
 	patched network
+	patched unix-time
 	patched lifted-base
 	patched zlib
 	patched process

standalone/linux/runshell

@@ -20,7 +20,7 @@ if [ ! -e "$base/bin/git" ]; then
 	exit 1
 fi
 if [ -n "$GIT_ANNEX_STANDLONE_ENV" ]; then
-	echo "** runshell loop detected!"> &2
+	echo "** runshell loop detected!" >&2
 fi
 
 # Get absolute path to base, to avoid breakage when things change directories.

standalone/osx/git-annex.app/Contents/MacOS/runshell

@@ -22,7 +22,7 @@ if [ ! -e "$bundle/git" ]; then
 	exit 1
 fi
 if [ -n "$GIT_ANNEX_STANDLONE_ENV" ]; then
-	echo "** runshell loop detected!"> &2
+	echo "** runshell loop detected!" >&2
 fi
 
 # Get absolute path to base, to avoid breakage when things change directories.