tree 410f2ff09f514a0216d8f7ce3ab42525236f3f03
parent 86c96da8d082866fe96cd8345fc80197efae1009
parent f6913592a12b0ae98b4f2c9132da7101f74b859a
author Guillaume J. Charmes <charmes.guillaume@gmail.com> 1380925242 -0700
committer Guillaume J. Charmes <charmes.guillaume@gmail.com> 1380925864 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQEcBAABAgAGBQJST0GqAAoJELM+RkLLbj/zZEYIALaTNCy9rx9XDpp8I41SmImC
 xaab8TdORaYpd9Ylypmo/N558OdPL2mKRad1UB4hL9ii+UTV0ArVv3F3q8VEuk+T
 iObiXKT5/oH2dOJw+P0pWPgGehe2Z6tDcKjxPtu5v9JVoU9eePRfQlrYdaGWhiO8
 iHg83V+ESZq+C0o5h3RPrVYZRG83fHxENEXMdTgN6Gy3xBz76y48+gy5J72Tq6x8
 PueBpZX7OwTpf9B6iY0/6JCf5pYNYrhvR3w/12XbsSuGPNObJQ8brvRqSpXlYlv+
 3NPSMeXy0qjfMLJocWLS3RVmHLYXjeDWUTgmfajOw6/zIUGp7kDRC+ekWwGQJnY=
 =3VPS
 -----END PGP SIGNATURE-----

Merge branch 'device-mapper-test' into 0.7-staging

Conflicts:
	Dockerfile
	docker/docker.go
	hack/PACKAGERS.md
	hack/make.sh
	hack/make/binary
	hack/make/test
	runtime.go
	runtime_test.go
	server.go
	utils.go
	utils/utils.go
	utils_test.go