Merge 'master' into 'psppsheet'.
[pspp] / config / .gitignore
1 Makefile
2 Makefile.in