Merge branch 'master' of pc18:/srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 15 Mar 2008 13:50:04 +0000 (14:50 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 15 Mar 2008 13:50:04 +0000 (14:50 +0100)
commit0d86193e5a413ad19f05ce68a3f562c1f7e260ef
tree30db51fabf418cc72e2ce96f7e27a4c9286c5240
parent9ff482d7e038693439fe7b3e150ccebf099ac024
parent2f4cd43c4483070e81c0862582a80b59a208f0dd
Merge branch 'master' of pc18:/srv/git/r/doldaconnect