Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
[monkeysphere.git] / .gitignore
1 *~
2 *.[ao]