moby/VERSION
Victor Vieux 380129d0d7 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>
2014-08-20 20:19:03 +00:00

1 line
No EOL
9 B
Text