From: mishaz <misha@curoverse.com>
Date: Sun, 11 Jan 2015 18:29:13 +0000 (+0000)
Subject: Merge branch 'master' of git.curoverse.com:arvados into 3408-production-datamanager
X-Git-Tag: 1.1.0~1505^2~54
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5bcba288077488791daa43a15d5fd5fb0c6e653c

Merge branch 'master' of git.curoverse.com:arvados into 3408-production-datamanager

Conflicts resolved:
	services/api/Gemfile
	services/api/Gemfile.lock
---

5bcba288077488791daa43a15d5fd5fb0c6e653c