From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Tue, 24 Jun 2014 20:04:10 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into pete-fixes
X-Git-Tag: 1.1.0~2521^2~18
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/676dfa352dbf55a23e0123b47d1affe33c028908

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

676dfa352dbf55a23e0123b47d1affe33c028908