Merge branch 'wip/new-jobd' into rorcz
commitae94df172df2f787e73f5bed4ba474af71a11b7d
authorJan Krüger <jk@jk.gs>
Fri, 5 Nov 2010 04:59:14 +0000 (5 05:59 +0100)
committerJan Krüger <jk@jk.gs>
Fri, 5 Nov 2010 04:59:14 +0000 (5 05:59 +0100)
tree6a37d13e6608343841eb4a36f40f37ae2c4ff8b6
parent4bc8edff718efd121942f3eb7a58a3300b492e8b
parented31400b5914fab0e24af0030c396afb0755387e
Merge branch 'wip/new-jobd' into rorcz