Merge remote-tracking branch 'origin/release'

Conflicts:
	VERSION
	integration-cli/docker_cli_build_test.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.1 (2014-07-09)
+
+#### Builder
+* Fix issue with ADD
+
 ## 1.1.0 (2014-07-03)
 
 #### Notable features since 1.0.1

VERSION

@@ -1 +1 @@
-1.1.0-dev
+1.1.1