]> rtime.felk.cvut.cz Git - omk.git/commitdiff
Merge branch 'devel-cherrypick'
authorMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 19 Feb 2009 08:16:09 +0000 (09:16 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 19 Feb 2009 08:16:09 +0000 (09:16 +0100)

Trivial merge