From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Thu, 26 Jun 2014 17:51:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into pete-fixes
X-Git-Tag: 1.1.0~2521^2~4
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/92aeef019a0c161d5989ffa581f56ba83b887c51

Merge remote-tracking branch 'origin/master' into pete-fixes
---

92aeef019a0c161d5989ffa581f56ba83b887c51