Merge remote-tracking branch 'branchable/master'

This commit is contained in:
Joey Hess 2011-05-14 12:30:19 -04:00
commit 89ee0c373b

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 4"
date="2011-05-14T16:29:35Z"
content="""
Although, if you really do want to shoot yourself in the foot, or know you have the old content, you can use `git-annex setkey`.
"""]]