From: Tim Pierce <twp@curoverse.com>
Date: Tue, 21 Jan 2014 22:14:40 +0000 (-0500)
Subject: Merge branch '1943-client-sdk-config-files'
X-Git-Tag: 1.1.0~2722^2~61
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d84737275793fcab0ac253c4abe734ad5e84ea12

Merge branch '1943-client-sdk-config-files'

Conflicts:
	sdk/python/arvados/__init__.py
---

d84737275793fcab0ac253c4abe734ad5e84ea12