From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 15 Feb 2010 16:21:48 +0000 (+0100)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:/var/git/edu/osp-wiki
X-Git-Tag: 2010/zadani~403^2~1
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/edu/osp-wiki.git/commitdiff_plain/b568060a484dbee0db87da407b7008a05b7512c6?hp=-c

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

b568060a484dbee0db87da407b7008a05b7512c6