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

4 files changed, 34 insertions, 0 deletions

diff --git a/doc/bugs/Android:_Adding_Repository_on_Box.net_fails_with___34__Internal_Server_Error__34__/comment_1_91787407727f7ed833d5970d3226d0cb._comment b/doc/bugs/Android:_Adding_Repository_on_Box.net_fails_with___34__Internal_Server_Error__34__/comment_1_91787407727f7ed833d5970d3226d0cb._comment
new file mode 100644
index 000000000..45d5da95e
--- /dev/null
+++ b/doc/bugs/Android:_Adding_Repository_on_Box.net_fails_with___34__Internal_Server_Error__34__/comment_1_91787407727f7ed833d5970d3226d0cb._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkI9pq1WH6MWeExXHVQVEsniT3DdFv4AB8"
+ nickname="Roberto"
+ subject="problem still persists"
+ date="2014-02-10T22:55:33Z"
+ content="""
+I'm trying right now the latest build (5.20140210-gd99db49) but the problem persists. Am I missing something? 
+"""]]
diff --git a/doc/bugs/Android:_Adding_Repository_on_Box.net_fails_with___34__Internal_Server_Error__34__/comment_2_f4c52fe33e9c4c107c2469fabb0c6826._comment b/doc/bugs/Android:_Adding_Repository_on_Box.net_fails_with___34__Internal_Server_Error__34__/comment_2_f4c52fe33e9c4c107c2469fabb0c6826._comment
new file mode 100644
index 000000000..d566170c9
--- /dev/null
+++ b/doc/bugs/Android:_Adding_Repository_on_Box.net_fails_with___34__Internal_Server_Error__34__/comment_2_f4c52fe33e9c4c107c2469fabb0c6826._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.172"
+ subject="comment 2"
+ date="2014-02-10T23:25:42Z"
+ content="""
+Hmm, I've verified that the certificate library I built for android uses the right path. But for some reason that path is not showing up in the android executable.
+
+I think perhaps things have changed and a different library is now being used! Probably <http://hackage.haskell.org/package/x509-system>
+"""]]
diff --git a/doc/news/version_5.20140210/comment_1_97065912d6a204c7387d7de5e48de420._comment b/doc/news/version_5.20140210/comment_1_97065912d6a204c7387d7de5e48de420._comment
new file mode 100644
index 000000000..fed533c60
--- /dev/null
+++ b/doc/news/version_5.20140210/comment_1_97065912d6a204c7387d7de5e48de420._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="rasmus"
+ ip="94.34.129.197"
+ subject="Bug?"
+ date="2014-02-11T00:36:45Z"
+ content="""
+In this build git annex gets confused with my username of rsync backends.  My username is annex@server but it keeps asking about rasmus@server (commandline and web interface).   Should I open a bug report about this?  Or is this a new feature that I haven't configured properly?
+"""]]
diff --git a/doc/news/version_5.20140210/comment_2_e589892996ca7cca3febdbf0f2cc379b._comment b/doc/news/version_5.20140210/comment_2_e589892996ca7cca3febdbf0f2cc379b._comment
new file mode 100644
index 000000000..74e5f0745
--- /dev/null
+++ b/doc/news/version_5.20140210/comment_2_e589892996ca7cca3febdbf0f2cc379b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.172"
+ subject="comment 2"
+ date="2014-02-11T00:48:35Z"
+ content="""
+I think you need to check your remote is configured properly before filing a bug report. But, there has been no change that is intended to lead to such a behavior.
+"""]]