Merge branch 'master' into no-cache
[monkeysphere.git] / .gitignore
1 *~
2 *.[ao]