asingha e7a099aac8 merging origin/git-annex into git-annex 2 rokov pred
..
588 e7a099aac8 merging origin/git-annex into git-annex 2 rokov pred