Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 1 Sep 2007 12:15:44 +0000 (14:15 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 1 Sep 2007 12:15:44 +0000 (14:15 +0200)
1  2 
clients/gui-shell/dsh.c

Simple merge