git.arvados.org - arvados.git/commit

author	Tim Pierce <twp@clinicalfuture.com>
	Mon, 11 Nov 2013 23:11:05 +0000 (18:11 -0500)
committer	Tim Pierce <twp@clinicalfuture.com>
	Mon, 11 Nov 2013 23:11:05 +0000 (18:11 -0500)
commit	b333125afe1ea130c7ea2438844983fcd7f08f1f
tree	e63dad9432bbc41b8f588b9b0b2ce08379cbde70	tree \| snapshot
parent	dc1967cf9fbd59498f6a0e86f082f56fae9d5b10	commit \| diff
parent	107df9b729eacbe378b6885bd604169be74fbdce	commit \| diff

Merge branch '1578-api-server-in-docker' of git.clinicalfuture.com:arvados into 1578-api-server-in-docker

Conflicts:
docker/config.rb