Joey Hess 63535e3dc7 Merge branch 'master' of ssh://git-annex.branchable.com		2014-03-20 12:13:45 -04:00
..
comment_1_307898855f91a2a189d4fa5eae62cce1._comment	fix up old comments that used format=txt, which is no longer enabled	2014-03-20 12:09:09 -04:00
comment_2_0a8ea42764dde1a33d2112197b961c51._comment	Added a comment: Use automatic merge without syncing	2014-03-20 10:03:41 +00:00
comment_3_5c587c6633cae1c8547ca970d55ee97e._comment	Added a comment	2014-03-20 16:10:11 +00:00