Merge branch 'master' of git.clinicalfuture.com:arvados
authorWard Vandewege <ward@clinicalfuture.com>
Mon, 18 Nov 2013 22:25:29 +0000 (17:25 -0500)
committerWard Vandewege <ward@clinicalfuture.com>
Mon, 18 Nov 2013 22:25:29 +0000 (17:25 -0500)
commit04347c9ee27bf3da2c90eb7bb612dbc6ad5a34c2
tree4a4b9bc37b81c53243ed933b7e38b282373d62b6
parentd8adfd7a4449673a29b981aefca99240c717d4ed
parent2ff9ca2fb06d644328896be242186d5fbc1ffd17
Merge branch 'master' of git.clinicalfuture.com:arvados

Conflicts:
docker/build.sh
docker/config.yml.example
docker/build.sh
docker/config.yml.example