From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 25 Mar 2015 07:55:03 +0000 (+0100)
Subject: Merge branch 'master' into uloha-server
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/edu/osp-wiki.git/commitdiff_plain/101330f98c196edcc44b4c9f51910fa2c991b211

Merge branch 'master' into uloha-server
---

101330f98c196edcc44b4c9f51910fa2c991b211