Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 8 Mar 2008 14:34:06 +0000 (15:34 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 8 Mar 2008 14:34:06 +0000 (15:34 +0100)
commit6155e0c76bf55b6848162350ad6696e14838515a
tree9a1d20ad9459d64fcac5d9dd1da208da25ade40d
parent8bdbfebe9d82bb4e941e59e39e98f3d295bca5ca
parent69190e655666e650a03dcaf7c3493b8a0ae89efb
Merge branch 'master' of git.dolda2000.com:/srv/git/r/doldaconnect