Merge branch 'wip/new-jobd' into rorcz
commitf50c1a1fc80f3020f8429b2edf26645fc6800d05
authorJan Krüger <jk@jk.gs>
Fri, 5 Nov 2010 01:56:22 +0000 (5 02:56 +0100)
committerJan Krüger <jk@jk.gs>
Fri, 5 Nov 2010 01:56:22 +0000 (5 02:56 +0100)
treece96f14780ccfbefd862a9e83cdf29e38e41e9a7
parenta136e44ef4e88dc1da0dc1eb5ac31dd8c41e2e45
parentc5664478469386c1516ad845a9564f488f3ba936
Merge branch 'wip/new-jobd' into rorcz