Merge branch '1943-client-sdk-config-files'
authorTim Pierce <twp@curoverse.com>
Tue, 21 Jan 2014 22:14:40 +0000 (17:14 -0500)
committerTim Pierce <twp@curoverse.com>
Tue, 21 Jan 2014 22:14:40 +0000 (17:14 -0500)
commitd84737275793fcab0ac253c4abe734ad5e84ea12
treeab167f34f36cc693968233e096dd1b042f13aa09
parent1e3aba5a02acd7670a4525ba9c0ce53b7e7e12de
parentb84df42d2949d46fe62c8ab5302be439bea66663
Merge branch '1943-client-sdk-config-files'

Conflicts:
sdk/python/arvados/__init__.py
services/api/app/controllers/arvados/v1/schema_controller.rb