]> rtime.felk.cvut.cz Git - frescor/frsh.git/commitdiff
Merge branch 'master' of rtime.felk.cvut.cz:/var/git/frescor/frsh_forb.git
authorPetr Jurcik <jurcikp@.(none)>
Wed, 19 Nov 2008 13:34:27 +0000 (14:34 +0100)
committerPetr Jurcik <jurcikp@.(none)>
Wed, 19 Nov 2008 13:34:27 +0000 (14:34 +0100)

Trivial merge