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/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=test%2Ftestrepo.git

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

e413f467b052cb91ef05c5c8352e06551270bdac