Julia Sprenger 7381cd1eb2 merging origin/git-annex into git-annex 1 rok pred
..
b35 7381cd1eb2 merging origin/git-annex into git-annex 1 rok pred