Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 13 Dec 2009 06:28:10 +0000 (07:28 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 13 Dec 2009 06:28:10 +0000 (07:28 +0100)

Trivial merge