Merge branch '1579-keep-server-in-docker' of git.clinicalfuture.com:arvados into...
authorTim Pierce <twp@clinicalfuture.com>
Mon, 18 Nov 2013 21:50:38 +0000 (16:50 -0500)
committerTim Pierce <twp@clinicalfuture.com>
Mon, 18 Nov 2013 21:50:38 +0000 (16:50 -0500)
commit2ff9ca2fb06d644328896be242186d5fbc1ffd17
tree46b757985556176a094ecb62b5d6c6b680ae5f5c
parent8b762e8fe6a399ea2b827c71735b93e9e58e0882
parent17b830239f474f3a43d69e49e83fa1e75bfcebc4
Merge branch '1579-keep-server-in-docker' of git.clinicalfuture.com:arvados into 1579-keep-server-in-docker