From: Simon Suchomel <xsuchom1@anxur.fi.muni.cz>
Date: Thu, 30 May 2013 15:55:04 +0000 (+0200)
Subject: Merge http://www.fi.muni.cz/~kas/git/pan13-paper
X-Git-Tag: odeslano-20130601-2314~10
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=eafe3e22e26382588563ac39d6f88dd022c740da;hp=eafe3e22e26382588563ac39d6f88dd022c740da;p=pan13-paper.git

Merge http://www.fi.muni.cz/~kas/git/pan13-paper

Conflicts:
	pan13-paper/pan13-notebook.bib
---