Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 29 Mar 2011 05:04:27 +0000 (07:04 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 29 Mar 2011 05:04:27 +0000 (07:04 +0200)

Trivial merge