Merge branch 'master' of git.dolda2000.com:/srv/git/r/dcp
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 27 Jan 2008 20:21:09 +0000 (21:21 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 27 Jan 2008 20:21:09 +0000 (21:21 +0100)
1  2 
dcp-init

diff --cc dcp-init
Simple merge