Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
[monky] / extras /
drwxr-xr-x   ..
drwxr-xr-x - nano
drwxr-xr-x - vim