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

CHANGELOG.md

+## 0.5.2 (unreleased)
+
+
+
 ## 0.5.1 (01/02/2014)
 
 BUG FIXES:

packer/version.go

@@ -10,12 +10,12 @@ import (
 var GitCommit string
 
 // The version of packer.
-const Version = "0.5.1"
+const Version = "0.5.2"
 
 // Any pre-release marker for the version. If this is "" (empty string),
 // then it means that it is a final release. Otherwise, this is the
 // pre-release marker.
-const VersionPrerelease = ""
+const VersionPrerelease = "dev"
 
 type versionCommand byte
 

website/counter.txt

+Just update this if you want to force a website push and it isn't
+working:
+
+1