another test
Merge branch 'master' of github.com:jaeggir/gitconfig-test