From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 2 Feb 2015 10:18:11 +0000 (+0100)
Subject: Merge branch 'master' into uloha-server
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/edu/osp-wiki.git/commitdiff_plain/b5d31b021030c914567c84b2db727670167a6008

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

b5d31b021030c914567c84b2db727670167a6008