Merge branch 'master' into imlib2
[monky] / extras / nano /
drwxr-xr-x   ..
-rw-r--r-- 112 README
-rw-r--r-- 5228 conky.nanorc