From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Wed, 15 Apr 2015 01:08:16 +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/a9faa7cc718142e8024f2349477bdd45c5f70d0c

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

a9faa7cc718142e8024f2349477bdd45c5f70d0c