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

2 files changed, 25 insertions, 0 deletions

diff --git a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_3_bb9c927b758fa64f999d20ac34558c63._comment b/doc/bugs/git-annex_smudge_fails_on_git_add/comment_3_bb9c927b758fa64f999d20ac34558c63._comment
new file mode 100644
index 000000000..58540a707
--- /dev/null
+++ b/doc/bugs/git-annex_smudge_fails_on_git_add/comment_3_bb9c927b758fa64f999d20ac34558c63._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077"
+ nickname="j_k_234"
+ subject="comment 3"
+ date="2016-04-13T10:15:03Z"
+ content="""
+Thanks for the reply.
+
+I'm pretty sure that I did build with MagicMime support - see the version output on original bug report.
+
+These are the commands I used to build it:
+
+```sh
+ renn:~/git-annex$ git checkout debian/6.20160229-1
+ renn:~/git-annex$ sudo aptitude install libmagic-dev
+ renn:~/git-annex$ stack install --flag git-annex:XMPP --flag git-annex:DBUS --flag git-annex:MagicMime
+```
+"""]]
diff --git a/doc/tips/Synology_NAS_and_git_annex/comment_9_52e1684fc40d1ab487a06cf13530871b._comment b/doc/tips/Synology_NAS_and_git_annex/comment_9_52e1684fc40d1ab487a06cf13530871b._comment
new file mode 100644
index 000000000..452f68fe4
--- /dev/null
+++ b/doc/tips/Synology_NAS_and_git_annex/comment_9_52e1684fc40d1ab487a06cf13530871b._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="Jan"
+ subject="comment 9"
+ date="2016-04-13T09:05:23Z"
+ content="""
+I doubt that the Debian package would be usable as-is on a Synology NAS? Perhaps it would require a standalone package, similar to armel but for PowerPC?
+"""]]