Merge remote-tracking branch 'origin/3261-keep-docker-config' into 3261-keep-docker...
authorTom Clegg <tom@curoverse.com>
Thu, 31 Jul 2014 19:29:48 +0000 (15:29 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 31 Jul 2014 19:29:48 +0000 (15:29 -0400)
commit57d004018f00b864dc883d9ff1ed508e57396095
treeaf5a58646f254e299d919a4ebf5bfbe31aa1ff23
parent96e1e7d819e587e20752ba46d89ae6f9a217903b
parent5f6af45e3f79b2dbff55e821465f3d599a9e44e6
Merge remote-tracking branch 'origin/3261-keep-docker-config' into 3261-keep-docker-config
docker/keep/Dockerfile