]> rtime.felk.cvut.cz Git - frescor/frsh-forb.git/commitdiff
Merge branch 'devel'
authorPetr Benes <benesp16@fel.cvut.cz>
Fri, 22 Apr 2011 12:03:32 +0000 (14:03 +0200)
committerPetr Benes <benesp16@fel.cvut.cz>
Fri, 22 Apr 2011 12:03:32 +0000 (14:03 +0200)

Trivial merge