3898: Merge branch 'master' into 3898-job-state-attr-TC
authorTom Clegg <tom@curoverse.com>
Mon, 22 Sep 2014 20:54:01 +0000 (16:54 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 22 Sep 2014 20:54:01 +0000 (16:54 -0400)
commit22c7912d7c62877647fc714cd0bbef8f37a2b120
tree55a58c2cb04450a0ba1a734b8143d9c352a6db45
parent5b2a15b6a4addfc648ef1060be47ffef64e64777
parent6fcb589fc76b9251a142dd76d3019c993cfcd71c
3898: Merge branch 'master' into 3898-job-state-attr-TC