Michael Denker ed62559934 merging origin/git-annex into git-annex 7 rokov pred
..
ffe ed62559934 merging origin/git-annex into git-annex 7 rokov pred