julien colomb b34208bde8 merging origin/git-annex into git-annex 3 rokov pred
..
4e7 b34208bde8 merging origin/git-annex into git-annex 3 rokov pred