Merge branch '1.8.0' into 1.8.1
[monky] / data /
drwxr-xr-x   ..
-rw-r--r-- 1233 Makefile.am
-rw-r--r-- 2549 conky.conf
-rw-r--r-- 1830 conky_no_x11.conf