Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2012-09-13 17:45:10 -04:00
commit 61c3ce6562

View file

@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant?
[[!poll open=yes 4 "Amazon S3" 5 "Box.com" 10 "My phone (or MP3 player)" 0 "Tahoe-LAFS" 1 "OpenStack SWIFT" 1 "Google Drive" 1 "Amazon Glacier"]]
[[!poll open=yes 4 "Amazon S3" 5 "Box.com" 11 "My phone (or MP3 player)" 0 "Tahoe-LAFS" 1 "OpenStack SWIFT" 1 "Google Drive" 1 "Amazon Glacier"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they