Merge branch 'master' of pc18:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 17 Apr 2008 14:37:59 +0000 (16:37 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 17 Apr 2008 14:37:59 +0000 (16:37 +0200)
commit4eba46be47f9897458fb3c985f14f75138049880
treec2b746938e112c47a3cd443651caaa6d2ae6cb2e
parentc5cf03e08105319ba179cfe60e1d6f858278bf73
parent00b8bb0b4f33936fa28ab0b1ef21c5290e844d07
Merge branch 'master' of pc18:/srv/git/r/doldaconnect