]> rtime.felk.cvut.cz Git - frescor/frsh.git/commitdiff
Merge branch 'master' of git://frsh-forb.git.sourceforge.net/gitroot/frsh-forb/frsh
authorMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 21 Jan 2011 20:24:52 +0000 (21:24 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 21 Jan 2011 20:24:52 +0000 (21:24 +0100)

Trivial merge