From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Fri, 13 May 2016 07:19:28 +0000 (+0200)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:/edu/osp-wiki
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/edu/osp-wiki.git/commitdiff_plain/df1e42b876c7919295ac0f1f751809809b383763

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

df1e42b876c7919295ac0f1f751809809b383763