Merge branch 'master' of ssh://doumenc.org/home/web/sites/git/config
drwxr-xr-x - bash
drwxr-xr-x - misc
drwxr-xr-x - vim