Merge branch 'master' into 6569-smarter-jobs-image
authorWard Vandewege <ward@curoverse.com>
Fri, 10 Jul 2015 03:19:04 +0000 (23:19 -0400)
committerWard Vandewege <ward@curoverse.com>
Fri, 10 Jul 2015 03:19:04 +0000 (23:19 -0400)
commitc830768910678af42a92d8d0b63ac96d5636361c
tree82aa9f5b2915281535a6956424eb761bbe5e25a7
parent2414412bb3360e02a72e5459711cf077a5e50380
parent97f5239f053b1691d7f2cb56230386921f8ea4d4
Merge branch 'master' into 6569-smarter-jobs-image