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

This commit is contained in:
Joey Hess 2012-09-15 22:41:06 -04:00
commit 719d229d9d

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 12 "Amazon S3" 5 "Box.com" 35 "My phone (or MP3 player)" 1 "Tahoe-LAFS" 3 "OpenStack SWIFT" 9 "Google Drive" 6 "Amazon Glacier"]]
[[!poll open=yes 12 "Amazon S3" 5 "Box.com" 35 "My phone (or MP3 player)" 1 "Tahoe-LAFS" 3 "OpenStack SWIFT" 9 "Google Drive" 7 "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