From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Fri, 15 Apr 2011 11:29:59 +0000 (+0200)
Subject: Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~/testrepo
X-Git-Tag: snapshot-20110506-0930~35
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=27f2cb3ae6465f35962fed243bc5a29dfdc5483d;hp=b2a19965172ae6fe4894129429fee6448faf6917;p=test%2Ftestrepo.git

Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~/testrepo
---

diff --git a/jezek.txt b/jezek.txt
index 1598fa3..d5e6e46 100644
--- a/jezek.txt
+++ b/jezek.txt
@@ -1 +1,2 @@
 Bodlináč # Toto nechat
+jabko