From d3193545d3ac15a40c5138183b12d6e0f4a2198d Mon Sep 17 00:00:00 2001
From: Ed Stoner <ed@whsd.net>
Date: Wed, 31 Oct 2007 17:08:58 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/mamamedia/flipsticks

---
diff --git a/README b/README
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/README
--
cgit v0.9.1