Merge branch 'master' of pc18:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Mon, 18 Feb 2008 14:40:18 +0000 (15:40 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Mon, 18 Feb 2008 14:40:18 +0000 (15:40 +0100)
commitbe11f9941bebe6659f95f71460470b0eb6d9a105
tree7aa690240121de23878faff7e1fec6bbe9481b3e
parent8580402ca0745bac597240d64341731eb198e1f1
parentb6e4d01dcaacd412be854115108c916d284325cf
Merge branch 'master' of pc18:/srv/git/r/doldaconnect