Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 7 Jul 2007 02:58:40 +0000 (02:58 +0000)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 7 Jul 2007 02:58:40 +0000 (02:58 +0000)
1  2 
kokare.c

diff --cc kokare.c
Simple merge