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)
commitaf14d4220296eb4080cf0fcb7b8b3f2bc4ff1a2b
tree600b071fbd363f59a69ee35506c7a70d068d4426
parentf05313f6190e2ddb2caaac60f7d7d242913d47b3
parentf12fa57b8c0c5aef786a0111fd78cdb61dde9595
Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc