Merge branch 'wip/new-jobd' into rorcz
commit3339b470877b0f8a3a6aaa548fe8cd20b2767006
authorJan Krüger <jk@jk.gs>
Fri, 5 Nov 2010 06:24:04 +0000 (5 07:24 +0100)
committerJan Krüger <jk@jk.gs>
Fri, 5 Nov 2010 06:24:04 +0000 (5 07:24 +0100)
tree8fcae3ae01a18d5c682a0874f43db3914bd2284d
parentda3bc661beb318f7fb5ccd2b13ae794c2c8d181b
parent473a0f90176b218bc3f41c0e472f25f565fb2445
Merge branch 'wip/new-jobd' into rorcz