Merge remote branch 'origin/master' into wosch
[mkws-moved-to-github.git] / .gitignore
1 *~
2 *.swp