Merge branch 'master' of https://github.com/mitchellh/packer into docker-metadata

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## 0.5.2 (unreleased)
 
+BUG FIXES:
 
+* builders/docker: user variables work properly. [GH-777]
 
 ## 0.5.1 (01/02/2014)
 

builder/docker/config.go

@@ -29,6 +29,8 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
 		return nil, nil, err
 	}
 
+	c.tpl.UserVars = c.PackerUserVars
+
 	// Defaults
 	if len(c.RunCommand) == 0 {
 		c.RunCommand = []string{