Merge branch 'wip/new-jobd' into rorcz
commitc481d3291308afbbec03107cc6e62d35c085ac5a
authorJan Krüger <jk@jk.gs>
Fri, 5 Nov 2010 05:02:10 +0000 (5 06:02 +0100)
committerJan Krüger <jk@jk.gs>
Fri, 5 Nov 2010 05:02:10 +0000 (5 06:02 +0100)
treeb11ee0879d35e1265b740c745f127d0ab7b1917d
parentae94df172df2f787e73f5bed4ba474af71a11b7d
parentbb3365336691239790cfc5b2e46288751d5eeadd
Merge branch 'wip/new-jobd' into rorcz