From: Steffen Stengaard Villadsen <omegasteffy@gmail.com>
Date: Thu, 4 Nov 2010 22:35:08 +0000 (+0100)
Subject: Merge git+ssh://git.asbjorn.biz/rapper
X-Git-Url: http://git.asbjorn.biz/?p=rapper.git;a=commitdiff_plain;h=1da5e41a8eecc5bc9d4fe835c320643d951ef6c0;hp=084b1d39d71fb5663f3bdfd9a47a067a6ee29461

Merge git+ssh://git.asbjorn.biz/rapper

Conflicts:
	README
---

diff --git a/README b/README
index f24e15d..713786a 100644
--- a/README
+++ b/README
@@ -1,3 +1,2 @@
 Steff test
-
-Test2
\ No newline at end of file
+Svenne test