From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Fri, 14 Jun 2013 09:54:32 +0000 (+0200)
Subject: Merge commit 'b2a29f'
X-Git-Tag: odeslano-20130617-1053~1
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=pan13-paper.git;a=commitdiff_plain;h=cab97e4c70f87760967fa79a859178b3e016d74f

Merge commit 'b2a29f'

Simon si zapomnel pullnout odeslanou verzi.
---

cab97e4c70f87760967fa79a859178b3e016d74f