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

doc/bugs/Android:_Clocking_on___34__Files__34___in_the_Dashboard_seems_to_do_nothing/comment_1_a9b03d4f4760fea2754a4dc93547f0a3._comment

@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.64"
+ subject="comment 1"
+ date="2013-11-26T16:12:42Z"
+ content="""
+git-annex does not have a built-in file manager. I don't know how to get android to display a file manager; if there's a command that can be run, or an intent that can be used to get one, git-annex could do that. But I don't think android typically includes a file manager, I have only seen them as OEM addons on some of the more laptop form factor android devices.
+
+I think that the android web browser also does not support browsing file:// uri, which is what git-annex falls back to when it cannot file a file manager to top. 
+"""]]

doc/bugs/Android___34__This_build_of_git-annex_does_not_support_XMPP_pairing__34__/comment_1_c034bb84e58b2dda1038ba205ec78c56._comment

@@ -0,0 +1,273 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.64"
+ subject="comment 1"
+ date="2013-11-26T17:23:52Z"
+ content="""
+I think that older Android builds did support this (IIRC). However, I recently rebootstrapped my android dev environment, and when I enable the XMPP flag now:
+
+<pre>
+system.c:222:0:  error: undefined reference to 'pthread_atfork'
+
+cipher.c:213:0:  error: undefined reference to 'nettle_cbc_encrypt'
+
+cipher.c:213:0:  error: undefined reference to 'nettle_cbc_decrypt'
+
+cipher.c:213:0:  error: undefined reference to 'nettle_des_encrypt'
+
+cipher.c:213:0:  error: undefined reference to 'nettle_des_decrypt'
+
+cipher.c:213:0:
+     error: undefined reference to 'nettle_arcfour_crypt'
+
+cipher.c:213:0:
+     error: undefined reference to 'nettle_des3_encrypt'
+
+cipher.c:213:0:
+     error: undefined reference to 'nettle_des3_decrypt'
+
+cipher.c:213:0:
+     error: undefined reference to 'nettle_arctwo_encrypt'
+
+cipher.c:213:0:
+     error: undefined reference to 'nettle_arctwo_decrypt'
+
+cipher.c:265:0:
+     error: undefined reference to 'nettle_arcfour_set_key'
+
+cipher.c:68:0:
+     error: undefined reference to 'nettle_aes_set_encrypt_key'
+
+cipher.c:69:0:
+     error: undefined reference to 'nettle_aes_invert_key'
+
+cipher.c:96:0:
+     error: undefined reference to 'nettle_camellia_set_encrypt_key'
+
+cipher.c:97:0:
+     error: undefined reference to 'nettle_camellia_invert_key'
+
+cipher.c:268:0:
+     error: undefined reference to 'nettle_arctwo_set_key'
+
+cipher.c:239:0:
+     error: undefined reference to 'nettle_des_fix_parity'
+
+cipher.c:242:0:
+     error: undefined reference to 'nettle_des3_set_key'
+
+cipher.c:255:0:
+     error: undefined reference to 'nettle_des_fix_parity'
+
+cipher.c:257:0:  error: undefined reference to 'nettle_des_set_key'
+
+cipher.c:83:0:  error: undefined reference to 'nettle_aes_decrypt'
+
+cipher.c:76:0:  error: undefined reference to 'nettle_aes_encrypt'
+
+cipher.c:111:0:
+     error: undefined reference to 'nettle_camellia_crypt'
+
+cipher.c:104:0:
+     error: undefined reference to 'nettle_camellia_crypt'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha256_update'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha224_digest'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha224_set_key'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_md5_update'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_md5_digest'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_md5_set_key'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha1_update'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha1_digest'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha1_set_key'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha256_digest'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha256_set_key'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha512_update'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha384_digest'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha384_set_key'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha512_digest'
+
+mac.c:146:0:
+     error: undefined reference to 'nettle_hmac_sha512_set_key'
+
+mac.c:243:0:  error: undefined reference to 'nettle_sha224_init'
+
+mac.c:222:0:  error: undefined reference to 'nettle_md5_init'
+
+mac.c:229:0:  error: undefined reference to 'nettle_sha1_init'
+
+mac.c:236:0:  error: undefined reference to 'nettle_md2_init'
+
+mac.c:250:0:  error: undefined reference to 'nettle_sha256_init'
+
+mac.c:257:0:  error: undefined reference to 'nettle_sha384_init'
+
+mac.c:264:0:  error: undefined reference to 'nettle_sha512_init'
+
+mac.c:278:0:  error: undefined reference to 'nettle_sha256_update'
+
+mac.c:278:0:  error: undefined reference to 'nettle_sha224_digest'
+
+mac.c:278:0:  error: undefined reference to 'nettle_md5_update'
+
+mac.c:278:0:  error: undefined reference to 'nettle_md5_digest'
+
+mac.c:278:0:  error: undefined reference to 'nettle_sha1_update'
+
+mac.c:278:0:  error: undefined reference to 'nettle_sha1_digest'
+
+mac.c:278:0:  error: undefined reference to 'nettle_md2_update'
+
+mac.c:278:0:  error: undefined reference to 'nettle_md2_digest'
+
+mac.c:278:0:  error: undefined reference to 'nettle_sha256_digest'
+
+mac.c:278:0:  error: undefined reference to 'nettle_sha512_update'
+
+mac.c:278:0:  error: undefined reference to 'nettle_sha384_digest'
+
+mac.c:278:0:  error: undefined reference to 'nettle_sha512_digest'
+
+mpi.c:48:0:
+     error: undefined reference to 'nettle_mpz_sizeinbase_256_u'
+
+mpi.c:80:0:  error: undefined reference to 'nettle_mpz_get_str_256'
+
+mpi.c:76:0:  error: undefined reference to 'nettle_mpz_get_str_256'
+
+mpi.c:52:0:
+     error: undefined reference to 'nettle_mpz_sizeinbase_256_s'
+
+mpi.c:56:0:
+     error: undefined reference to 'nettle_mpz_sizeinbase_256_u'
+
+mpi.c:142:0:
+     error: undefined reference to 'nettle_mpz_set_str_256_u'
+
+mpi.c:117:0:
+     error: undefined reference to 'nettle_mpz_set_str_256_u'
+
+mpi.c:121:0:
+     error: undefined reference to 'nettle_mpz_set_str_256_s'
+
+mpi.c:470:0:
+     error: undefined reference to 'nettle_mpz_set_str_256_u'
+
+mpi.c:496:0:
+     error: undefined reference to 'nettle_mpz_set_str_256_u'
+
+pk.c:505:0:
+     error: undefined reference to 'nettle_dsa_public_key_init'
+
+pk.c:506:0:
+     error: undefined reference to 'nettle_dsa_private_key_init'
+
+pk.c:515:0:
+     error: undefined reference to 'nettle_dsa_generate_keypair'
+
+pk.c:545:0:
+     error: undefined reference to 'nettle_dsa_private_key_clear'
+
+pk.c:546:0:
+     error: undefined reference to 'nettle_dsa_public_key_clear'
+
+pk.c:558:0:
+     error: undefined reference to 'nettle_rsa_public_key_init'
+
+pk.c:559:0:
+     error: undefined reference to 'nettle_rsa_private_key_init'
+
+pk.c:563:0:
+     error: undefined reference to 'nettle_rsa_generate_keypair'
+
+pk.c:598:0:
+     error: undefined reference to 'nettle_rsa_private_key_clear'
+
+pk.c:599:0:
+     error: undefined reference to 'nettle_rsa_public_key_clear'
+
+pk.c:598:0:
+     error: undefined reference to 'nettle_rsa_private_key_clear'
+
+pk.c:599:0:
+     error: undefined reference to 'nettle_rsa_public_key_clear'
+
+pk.c:545:0:
+     error: undefined reference to 'nettle_dsa_private_key_clear'
+
+pk.c:546:0:
+     error: undefined reference to 'nettle_dsa_public_key_clear'
+
+pk.c:286:0:
+     error: undefined reference to 'nettle_dsa_signature_init'
+
+pk.c:296:0:  error: undefined reference to '_nettle_dsa_sign'
+
+pk.c:309:0:
+     error: undefined reference to 'nettle_dsa_signature_clear'
+
+pk.c:344:0:
+     error: undefined reference to 'nettle_rsa_compute_root'
+
+pk.c:309:0:
+     error: undefined reference to 'nettle_dsa_signature_clear'
+
+pk.c:231:0:
+     error: undefined reference to 'nettle_rsa_compute_root'
+
+pk.c:441:0:  error: undefined reference to '_nettle_dsa_verify'
+
+rnd.c:222:0:
+     error: undefined reference to 'nettle_yarrow256_update'
+
+rnd.c:340:0:
+     error: undefined reference to 'nettle_yarrow256_update'
+
+rnd.c:284:0:
+     error: undefined reference to 'nettle_yarrow256_update'
+
+rnd.c:388:0:
+     error: undefined reference to 'nettle_yarrow256_slow_reseed'
+
+rnd.c:465:0:
+     error: undefined reference to 'nettle_yarrow256_random'
+
+rnd.c:421:0:  error: undefined reference to 'nettle_yarrow256_init'
+
+rnd.c:437:0:
+     error: undefined reference to 'nettle_yarrow256_slow_reseed'
+collect2: error: ld returned 1 exit status
+make: *** [android] Error 1
+</pre>
+
+
+"""]]

doc/bugs/Assistant_has_created_155_semitrusted_repositories/comment_8_119142c5ebc499f0ee0926dbca265308._comment

@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.64"
+ subject="comment 8"
+ date="2013-11-26T16:34:13Z"
+ content="""
+Yes, it would be helpful to have the full history of the file.
+
+You might try running `git annex fsck` on the file in the client that it says it has gotten but that you cannot access.
+"""]]

doc/bugs/Too_many_open_files/comment_1_d5d509b9b431d2ea6000ebc0aed62857._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.64"
+ subject="comment 1"
+ date="2013-11-26T16:28:25Z"
+ content="""
+You can use `lsof -c git-annex` to find out what files git-annex has open. (lsof is included in the git-annex.app bundle on OSX) That would be very helpful in tracking this down.
+"""]]

doc/bugs/__91__wishlistAndroid:_bundle_an_ssh_server___40__dropbear__63____41___and_add_an_option_to_start_it_easily_with_the_terminal_app_menu/comment_1_9bb53c45d685b368c7ba1758885f2874._comment

@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.64"
+ subject="comment 1"
+ date="2013-11-26T16:09:19Z"
+ content="""
+This was previously suggested in the forum: [[forum/Suggestion:_Put_ssh_server_back_into_android_version]]
+
+As said there, I feel that `adb` is a better option in these situations. Of course, the git-annex bundle already has a ssh client, so you can rsync files from it to other ssh servers too.
+
+Also, the bundle is too big, I don't want to make it any bigger.
+"""]]

doc/bugs/git-annex_does_not_install_on_windows_without_admin_rights/comment_1_2533800ab5a95c5d71c3b47a630e751a._comment

@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.64"
+ subject="comment 1"
+ date="2013-11-26T16:19:41Z"
+ content="""
+Thanks, this had been reported in the forum before, but they did not point at the directory permissions as the problem.
+
+It would be possible to modify the installer to install git-annex somewhere else and add it to the PATH, but it seems this is a utter nightmare on windows and I'd have to pull in enormous NSIS scripts from their wiki, of unknown provenance. Which is why I am piggybacking on the git installation's PATH.
+"""]]