Merge 'master' into 'gtk3'.
[pspp] / config /
drwxr-xr-x   ..
-rw-r--r-- 21 .gitignore