Merge remote-tracking branch 'origin/master' into 3988-crunch-use-job-state
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 24 Sep 2014 18:21:50 +0000 (14:21 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 24 Sep 2014 18:21:50 +0000 (14:21 -0400)
commit93c7127afd21f82662e9b471e7c617ae8c59ad19
tree4f299bf2f5c1fa4f9a89392cda1d813c4ddfe837
parent68dc1fcaec00d7d954be19f2c184e04626639616
parent2a8d349eaf2b1ac2254056ea32859f72a226d63f
Merge remote-tracking branch 'origin/master' into 3988-crunch-use-job-state