Merge branch 'master' into 6569-smarter-jobs-image
authorWard Vandewege <ward@curoverse.com>
Fri, 10 Jul 2015 20:18:44 +0000 (16:18 -0400)
committerWard Vandewege <ward@curoverse.com>
Fri, 10 Jul 2015 20:18:44 +0000 (16:18 -0400)
commit5fa837af6e73abbcf70e66c6de785e3a24259328
treed130f413e58c00fb1726a2d21551998510dc6e26
parent959ab858881801060b292a71b6e694c4801ef2eb
parentc47db46c7f2aac3ad1b099d8716c44dbb9f8bbf6
Merge branch 'master' into 6569-smarter-jobs-image