Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 29 Mar 2011 06:13:35 +0000 (08:13 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 29 Mar 2011 06:13:35 +0000 (08:13 +0200)
commitd45c718cd98a37af1023176f252a3c59775b7f10
treeba0eb97c79ad7b225da634f580b5cb3722192280
parentaf14d4220296eb4080cf0fcb7b8b3f2bc4ff1a2b
parentc39ae6d24864244eab704dea7307f769f2f2e9da
Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc