summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-03-08 18:45:35 -0500
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-03-08 18:45:35 -0500
commit75278b377825c595155191e351525a55ffb7adbd (patch)
treedc7a61d6cdb8c1f2fc80e1c946d95328e5ba6769
parent0f104084d79593ea001cacb36afd91937c894a54 (diff)
parent53510d5d03675b52738045084beffd5e3803b5a7 (diff)
Merge branch 'master' of http://micah.riseup.net/git/monkeysphere
-rw-r--r--micah0
-rw-r--r--micahschange0
2 files changed, 0 insertions, 0 deletions
diff --git a/micah b/micah
deleted file mode 100644
index e69de29..0000000
--- a/micah
+++ /dev/null
diff --git a/micahschange b/micahschange
deleted file mode 100644
index e69de29..0000000
--- a/micahschange
+++ /dev/null