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

doc/bugs/git-annex_6.20161031_fails_with_filenames_containing_newlines.mdwn

@@ -0,0 +1,43 @@
+### Please describe the problem.
+
+I tried to add a bunch of files and one of the files contained a newline in its name.
+When doing 'git annex add .' it failed with an error that contained only the part of the filename before the newline.
+
+### What steps will reproduce the problem?
+
+Create a file with a newline in its name:
+
+    ~/tmp $ touch 'file with newline'$'\n''line 2'
+    ~/tmp $ mkdir annex
+    ~/tmp $ cd annex/
+    ~/tmp/annex $ git init
+    ~/tmp/annex $ git annex init
+    init  ok
+    (recording state in git...)
+    ~/tmp/annex $ cp ../file* .
+    ~/tmp/annex $ git annex add .
+    add file with newline
+    line 2 git-annex: unknown response from git cat-file ("HEAD:./file with newline missing",Ref "HEAD:./file with newline\nline 2")
+    ~/tmp/annex $
+
+### What version of git-annex are you using? On what operating system?
+
+6.20161031 on Gentoo Linux
+
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+
+please see above
+
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+I hope to have very soon ;-)

doc/forum/_illegal_control_characters_in_pairing_message__59___ignoring/comment_6_f61a390f304e1f6d1e8c4a90cdfbd9b9._comment

@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="butirsky@86ff3803c45a8a1e5fc253d2728ce493c8addf96"
+ nickname="butirsky"
+ avatar="http://cdn.libravatar.org/avatar/bf8e56c57b179935c6f52ebc4690c2bf"
+ subject="comment 6"
+ date="2017-01-31T18:30:00Z"
+ content="""
+@joey, in my case all the user/host names are actual, and they do not include bad characters obviously
+"""]]