From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Tue, 24 Jan 2012 13:18:19 +0000 (+0100)
Subject: Merge branch 'sdilena_vetev' of ../testrepo into sdilena_vetev2
X-Git-Tag: snapshot-20120124-1430^2
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=39146849f931e1ac4eb9da708ab289d2ba04b04d;hp=932fa2eccb9249c3985178ffe8811b17c9969015;p=test%2Ftestrepo.git

Merge branch 'sdilena_vetev' of ../testrepo into sdilena_vetev2
---

diff --git a/zizala.txt b/zizala.txt
index fc12438..8621566 100644
--- a/zizala.txt
+++ b/zizala.txt
@@ -1,3 +1,4 @@
+roura
 trubka
 zizala
 zizala