From: Pavel Pisa <pi@baree.(none)>
Date: Wed, 28 Apr 2010 03:23:51 +0000 (+0200)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:/var/git/edu/osp-wiki
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/edu/osp-wiki.git/commitdiff_plain/f07fb6b79b0322deda89d952838f62ad1ae77076

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

f07fb6b79b0322deda89d952838f62ad1ae77076