From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Thu, 9 Aug 2012 18:30:26 +0000 (+0200)
Subject: Merge branch 'master' of ssh://calypso.fi.muni.cz/home/kas/git/pan12-paper
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=pan12-paper.git;a=commitdiff_plain;h=fb012b2add74c5aeee11754a3ae6df1394bfee25

Merge branch 'master' of ssh://calypso.fi.muni.cz/home/kas/git/pan12-paper
---

fb012b2add74c5aeee11754a3ae6df1394bfee25