Merge branches 'master' and 'devel'
tree1cd780bcae254a2aed0115ffc713c34cdc84ee15
-rw-r--r-- 12 .gitignore
drwxr-xr-x - dev-libs
drwxr-xr-x - dev-scheme
drwxr-xr-x - kde-misc
drwxr-xr-x - profiles
-rw-r--r-- 107 sets.conf
drwxr-xr-x - sets
drwxr-xr-x - sys-fs
drwxr-xr-x - x11-wm