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

Merge branch 'sdilena_vetev'
Argumenty: .git/MERGE_MSG merge
---

diff --git a/jezek.txt b/jezek.txt
index b672968..123c1ba 100644
--- a/jezek.txt
+++ b/jezek.txt
@@ -1,3 +1,4 @@
+jezecek
 #matko pridava sem 
 toto som sem pridal do vyvoja
 #koniec
@@ -22,3 +23,4 @@ edit2
 hack2
 jezek
 jezek
+jezek