Merge remote-tracking branch 'upstream/master' into cluster
[geeqie.git] / .tx /
drwxr-xr-x   ..
-rw-r--r-- 127 config