Merge branch 'master' of git.clinicalfuture.com:arvados
authorWard Vandewege <ward@clinicalfuture.com>
Wed, 13 Nov 2013 17:59:02 +0000 (12:59 -0500)
committerWard Vandewege <ward@clinicalfuture.com>
Wed, 13 Nov 2013 17:59:02 +0000 (12:59 -0500)
commite9ac76fd5acf83493f7230eabf0d74de1bb15b0b
treeb034bf5191307204d72aede1fbfebc559978c325
parent078a4f74fa9c078b9423be6f4d35e0b6932e191c
parent491ebf4a1574c3ff6f72a22386ccdbcb445a8686
Merge branch 'master' of git.clinicalfuture.com:arvados

Conflicts:
docker/workbench/Dockerfile