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

Conflicts:
	doc/polls/2013/direct_vs_indirect_mode.mdwn
	doc/polls/2013/number_of_repositories.mdwn
	doc/polls/2013/using_for.mdwn
This commit is contained in:
Joey Hess 2013-11-13 20:02:48 -04:00
commit c7bb7b1d46

Diff content is not available