Merge branch 'master' into imlib2
[monky] / extras / vim / ftdetect /
drwxr-xr-x   ..
-rw-r--r-- 162 conkyrc.vim