Merge branch 'wip/new-jobd' into rorcz
commit1ca168f99f4ddddbeb077ee23720fdacf54b05d2
authorJan Krüger <jk@jk.gs>
Sat, 6 Nov 2010 18:30:27 +0000 (6 19:30 +0100)
committerJan Krüger <jk@jk.gs>
Sat, 6 Nov 2010 18:30:27 +0000 (6 19:30 +0100)
treec4d0c0819de28ef3b603f02b79afd3708bbf4a65
parent9546caee994bdda6c8ab6420066a19308dc36fa4
parent90aa00cfbd218ec7b4f8f7ca0bd6317192bb250b
Merge branch 'wip/new-jobd' into rorcz