Merge commit 'micah/master'

[monkeysphere.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d2cf5887b24001a514277a311ac82635dc56c07b..ae9fbd8fc60e6a7ceb6ad9991cf9a03f79ea2ffb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *~
 *.[ao]
 monkeysphere
+gpg2ssh