summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-28 17:26:37 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-28 17:26:37 -0400
commitac15074d6e4295d31482b875deae0c4410db5d0d (patch)
treec5bd8f11ff82d7c122e90bbe1267b44df04097bd /doc
parentd7b9f14298f7bd8d711a412f84f5561979303f60 (diff)
parente7616efc99fab2a3367ced1ba03b86afc3230073 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
-rw-r--r--doc/design/assistant/blog/day_66__the_merge/comment_3_3961a03e167903959b96b054835613f6._comment8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/design/assistant/blog/day_66__the_merge/comment_3_3961a03e167903959b96b054835613f6._comment b/doc/design/assistant/blog/day_66__the_merge/comment_3_3961a03e167903959b96b054835613f6._comment
new file mode 100644
index 000000000..4a4d0df40
--- /dev/null
+++ b/doc/design/assistant/blog/day_66__the_merge/comment_3_3961a03e167903959b96b054835613f6._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
+ nickname="Jimmy"
+ subject="comment 3"
+ date="2012-08-28T18:44:28Z"
+ content="""
+As per usual I'd volunteer to test on OSX as well.
+"""]]