From: Joshua C. Randall <jcrandall@alum.mit.edu>
Date: Mon, 23 Mar 2015 17:50:49 +0000 (+0000)
Subject: Merge pull request #1 from curoverse/master
X-Git-Tag: 1.1.0~1309^2~14^2^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/df9e166a5ffc4aa79658bec1a5d552a3b413f0d8

Merge pull request #1 from curoverse/master

pulling from upstream
---

df9e166a5ffc4aa79658bec1a5d552a3b413f0d8