Merge branch 'wip/new-jobd' into rorcz
commit4ba8817be46e97f15b0770244cd9578f924edac8
authorJan Krüger <jk@jk.gs>
Fri, 5 Nov 2010 03:11:55 +0000 (5 04:11 +0100)
committerJan Krüger <jk@jk.gs>
Fri, 5 Nov 2010 03:11:55 +0000 (5 04:11 +0100)
tree521604cc24af6afdf9e67c142c83ca1142f28dbd
parentbb784e94a7915cd7745d3a62a0b402f120384a3d
parentabe2a947e75d28e041ca69b32158ebb67d0560dc
Merge branch 'wip/new-jobd' into rorcz