Merge branch 'master' of /srv/git/r/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 22 May 2012 00:37:23 +0000 (02:37 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 22 May 2012 00:37:23 +0000 (02:37 +0200)

Trivial merge