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
..
prioritizing_special_remotes	Added a comment: Google Music as remote?	2012-10-31 06:07:32 +00:00
prioritizing_special_remotes.mdwn	Merge branch 'master' of ssh://git-annex.branchable.com	2012-11-17 16:12:03 -04:00