Thijs e706cd9a98 merging origin/git-annex into git-annex 2 rokov pred
..
463 e706cd9a98 merging origin/git-annex into git-annex 2 rokov pred