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=a20adbf23196d3ae7cfc638477a64568159b57fc;p=test%2Ftestrepo.git

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

diff --git a/subdir/jezek b/subdir/jezek
index 8480e47..db8a44c 100644
--- a/subdir/jezek
+++ b/subdir/jezek
@@ -1,2 +1,3 @@
 jezek
 dalsi jezek
+spousty jezku
diff --git a/tux3.txt b/tux3.txt
new file mode 100644
index 0000000..5df0c70
--- /dev/null
+++ b/tux3.txt
@@ -0,0 +1 @@
+Třetí tučňák.