tree a85556f5eb217eefd2c530083d599d2cf8df2b69
parent 1df87acb3375b6c2765e2202f178dee699647448
parent b1d20c483ae91870d2525fa2a302d4461cbe8129
author Victor Vieux <vieux@docker.com> 1408565943 +0000
committer Victor Vieux <vieux@docker.com> 1408565943 +0000

Merge remote-tracking branch 'origin/master' into bump_v1.2.0

Conflicts:
	VERSION
	daemon/container.go
	daemon/daemon.go

Signed-off-by: Victor Vieux <vieux@docker.com>