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