]> rtime.felk.cvut.cz Git - canping.git/commitdiff
Merge my local version with 'master' of git://ortcan.git.sourceforge.net/gitroot...
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 9 Nov 2010 11:59:41 +0000 (12:59 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 9 Nov 2010 12:00:03 +0000 (13:00 +0100)

Trivial merge