summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-12-11 12:17:36 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-12-11 12:17:36 -0400
commit30b7bdefacc39da6cd0fc6585b732a1500554b51 (patch)
tree271b3340b0f122f7cc87b87ade6b3c73fd4623ec
parentf612c4ecd55e45706c3d541f9ea0ecac62b3b7b5 (diff)
parentdbc31d9e75620a9f6c04c0281ecd5a3439cc4a7e (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/preferred_content/comment_5_f0a957e67297c4bb5a8778c11b3c9fd4._comment9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/preferred_content/comment_5_f0a957e67297c4bb5a8778c11b3c9fd4._comment b/doc/preferred_content/comment_5_f0a957e67297c4bb5a8778c11b3c9fd4._comment
new file mode 100644
index 000000000..7074541eb
--- /dev/null
+++ b/doc/preferred_content/comment_5_f0a957e67297c4bb5a8778c11b3c9fd4._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="173.162.44.162"
+ subject="comment 5"
+ date="2012-12-11T16:03:04Z"
+ content="""
+thanks!
+
+"""]]