Merge branch 'master' of git.clinicalfuture.com:arvados
authorTim Pierce <twp@clinicalfuture.com>
Tue, 19 Nov 2013 17:44:34 +0000 (12:44 -0500)
committerTim Pierce <twp@clinicalfuture.com>
Tue, 19 Nov 2013 17:44:34 +0000 (12:44 -0500)
commita3a19bfc20889601b07156a5aa80fd5c6defba4b
tree292def66d87640ba70142bdc93aa4ed160239f66
parentfbe4733be833b2d1b7c25109289e0a79f90583bf
parent6b8c9a6ed9c0600e6e6d151a79f9aa3bf23c748f
Merge branch 'master' of git.clinicalfuture.com:arvados

Conflicts:
docker/base/Dockerfile
docker/README
docker/base/Dockerfile