From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Wed, 6 May 2015 22:34:42 +0000 (+0200)
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/321e61b1f3934687946fa00c05b9ac2f2cfc1485

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

321e61b1f3934687946fa00c05b9ac2f2cfc1485