Merge remote branch 'origin/master' into wosch
[mkws-moved-to-github.git] / .gitignore
2014-02-27 Heikki LevantoMy tests, setup stuff