Merge branch 'jobd-updates' into rorcz
commit697f12ad4dba62dfcd3400ec3d9a88f105e80422
authorJan Krüger <jk@jk.gs>
Wed, 24 Nov 2010 19:22:14 +0000 (24 20:22 +0100)
committerJan Krüger <jk@jk.gs>
Wed, 24 Nov 2010 19:22:14 +0000 (24 20:22 +0100)
treeb6fc5ce165b46f2ccd9fe9d0ea00d2769bf1d0a3
parentcc65933a6855432a5c8a7f5491bd2d29a1cc208e
parent968b92ed69942092556a4a2fd6684efe87899655
Merge branch 'jobd-updates' into rorcz