dotcloud/docker — pull request #1943 by vieux (2013-09-20 12:47:18+00:00)
Title: abord build if mergeConfig returns an error and fix duplicate error message

Fixes #1940