Merge branch 'master' of pc18:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 21 Mar 2008 15:17:34 +0000 (16:17 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 21 Mar 2008 15:17:34 +0000 (16:17 +0100)
commitec55ca86313f8b0208d2334c03bb615c0bb4bbbd
treef634d12594d32fea0637ea78e6b7098ae2379a59
parent0d86193e5a413ad19f05ce68a3f562c1f7e260ef
parent6d3c4a866cf944fbeb76f15bccd672ea1d298429
Merge branch 'master' of pc18:/srv/git/r/doldaconnect