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

doc/bugs/Unfortunate_interaction_with_Calibre/comment_4_ff7d2e9a39dfe12b975d04650ac57cc4._comment

@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkvSZ1AFJdY_1FeutZr_KWeqtzjZta1PNE"
+ nickname="Thedward"
+ subject="comment 4"
+ date="2013-01-18T16:30:59Z"
+ content="""
+I couldn't get calibre to work with sharebox either, but I can confirm it works fine when I use git-annex in direct mode.
+"""]]

doc/design/assistant/polls/prioritizing_special_remotes.mdwn

@@ -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 15 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 67 "My phone (or MP3 player)" 18 "Tahoe-LAFS" 6 "OpenStack SWIFT" 23 "Google Drive"]]
+[[!poll open=yes 15 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 67 "My phone (or MP3 player)" 18 "Tahoe-LAFS" 6 "OpenStack SWIFT" 24 "Google Drive"]]
 
 This poll is ordered with the options I consider easiest to build
 listed first. Mostly because git-annex already supports them and they

doc/install/OSX/comment_4_25cac8bcd84a5210fc0a5243260b8cc7._comment

@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnaYy6kTuKAHmsa4BtGls2oqa42Jo2w2v0"
+ nickname="Pere"
+ subject="Snow Leopard"
+ date="2013-01-18T15:51:48Z"
+ content="""
+Hi,
+
+Are there plans to provide a git-annex.app that works on Snow Leopard? 
+
+Currently there are only installers for the Lions.
+
+http://downloads.kitenet.net/git-annex/OSX/current/
+
+Thanks :-)
+
+
+"""]]