From: Michal Horn <hornmich@fel.cvut.cz>
Date: Tue, 18 Feb 2014 13:46:54 +0000 (+0100)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:edu/osp-wiki
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/edu/osp-wiki.git/commitdiff_plain/a1b99bb0e0c57c34a97b3e1a85aed179c4f2115b

Merge branch 'master' of rtime.felk.cvut.cz:edu/osp-wiki
---

a1b99bb0e0c57c34a97b3e1a85aed179c4f2115b