From: Petr Benes <benesp16@fel.cvut.cz>
Date: Fri, 22 Apr 2011 12:03:32 +0000 (+0200)
Subject: Merge branch 'devel'
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/frsh-forb.git/commitdiff_plain/38ee95c74e15afec33f2c180ae6a316f33ec54cb

Merge branch 'devel'
---

38ee95c74e15afec33f2c180ae6a316f33ec54cb