From 9d6532ee816a8d7ee51de06293f379125bec5c59 Mon Sep 17 00:00:00 2001
From: root <root@ghunt-desktop.(none)>
Date: Wed, 09 Jun 2010 14:23:22 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:xophoto/mainline

---
diff --git a/test.txt b/test.txt
deleted file mode 100644
index aa20643..0000000
--- a/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello, George
--
cgit v0.9.1