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:
commit
c7bb7b1d46
Conflicts: doc/polls/2013/direct_vs_indirect_mode.mdwn doc/polls/2013/number_of_repositories.mdwn doc/polls/2013/using_for.mdwn