From: MegaBrutal <megabrutal@jedi.lan>
Date: Mon, 15 Dec 2014 13:35:49 +0000 (+0100)
Subject: Merge branch 'master' of ssh://gitcentre/srv/git/test
X-Git-Url: http://git.megabrutal.com/?p=test.git;a=commitdiff_plain;h=HEAD;hp=6f05c9cbf40a8b780a938447857ef4350030789b

Merge branch 'master' of ssh://gitcentre/srv/git/test
---

diff --git a/bika b/bika
new file mode 100644
index 0000000..6afffd4
--- /dev/null
+++ b/bika
@@ -0,0 +1 @@
+bika
diff --git a/majom b/majom
index a90fe7b..fc8c481 100644
--- a/majom
+++ b/majom
@@ -1 +1,3 @@
 majom
+cica
+hangya