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

Merge branch 'master' of rtime:edu/osp-wiki
---

b0b1b2e217f6c8cd549ee7fe2db4f5c84427843e