Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 13 Oct 2009 18:07:58 +0000 (20:07 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 13 Oct 2009 18:07:58 +0000 (20:07 +0200)
commita7c50bd905f146c3a28c991e72f43bc9079f3ed8
tree175f3d0641d42ffb0ec2e709bd12b8a17a2e4a83
parentb5f270350bfadea58c6b14516422df00202e9d46
parent18a289941f029666d490c4045ed89dccf64b8a1b
Merge branch 'master' of git.dolda2000.com:/srv/git/r/jsvc