From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Wed, 4 Jun 2014 19:19:10 +0000 (-0400)
Subject: Merge branch 'master' into 2882-job-process-stats refs #2882
X-Git-Tag: 1.1.0~2580^2~3
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f6f4efcf298d5c37b5eb8a88eb164cf8b77ae928

Merge branch 'master' into 2882-job-process-stats refs #2882
---

f6f4efcf298d5c37b5eb8a88eb164cf8b77ae928