From 3bc416abf330674c2200d9ffc6d60838d7fcc76c Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 29 May 2008 16:51:52 +0000
Subject: Merge commit 'github/master'

---
 files/.git_placeholder | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 files/.git_placeholder

diff --git a/files/.git_placeholder b/files/.git_placeholder
new file mode 100644
index 0000000..89cb1fe
--- /dev/null
+++ b/files/.git_placeholder
@@ -0,0 +1 @@
+# file needed for git - don't remove it
-- 
cgit v1.2.3