From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Fri, 15 Apr 2011 07:03:50 +0000 (+0200)
Subject: Merge branch 'master' of ssh://ariadna1.fi.muni.cz/~git/testrepo
X-Git-Tag: snapshot-20110506-0930~39^2~1
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=121df6014c403daed95d3dfbd27eeae389923e9b;hp=a1e792d74ff52bf08c191b51599577c07885c6d1;p=test%2Ftestrepo.git

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

diff --git a/subdir/soubor_v_podadresari b/subdir/soubor_v_podadresari
index 55c11af..3d4c866 100644
--- a/subdir/soubor_v_podadresari
+++ b/subdir/soubor_v_podadresari
@@ -1 +1 @@
-jezek
+krtek16241