Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 29 Oct 2009 03:56:23 +0000 (04:56 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 29 Oct 2009 03:56:23 +0000 (04:56 +0100)

Trivial merge