dotcloud/docker — pull request #695 by dtzWill (2013-05-23 20:55:25+00:00)
Title: utils.go: Fix merge logic for user and hostname.

Fall back to image-specified hostname if user doesn't
provide one, instead of only using image-specified
hostname if the user *does* try to set one.
(ditto for username)

Closes #694.