Joey Hess 8b3ee87323 Merge branch 'master' of ssh://git-annex.branchable.com ... Conflicts: doc/design/assistant/polls/prioritizing_special_remotes.mdwn		2012-11-17 16:12:03 -04:00
..
assistant	Merge branch 'master' of ssh://git-annex.branchable.com	2012-11-17 16:12:03 -04:00
encryption	Added a comment	2012-08-15 19:16:10 +00:00
assistant.mdwn	we're in month 5 already! It seems to be more cloud stuff, so far..	2012-11-10 15:54:58 -04:00
encryption.mdwn	fix link	2012-05-23 19:37:22 -04:00