tree c08261ed3de53cd9f25fd808f9ad9aabb0dcbb71
parent 27140018c55021e3eeb37337ea1cf40862b8bf6a
parent bc929333846a276425ea76857e1e8af5447c1ea8
author Guillaume J. Charmes <charmes.guillaume@gmail.com> 1382136543 -0700
committer Guillaume J. Charmes <charmes.guillaume@gmail.com> 1382139615 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQEcBAABAgAGBQJSYccJAAoJELM+RkLLbj/zvakIAJWdfcmn1J5iBtCnSnRN1ELf
 NWIjGVo44SyI3OR01V7MINWAxtyz+4+NINqRuBY82GuS5RucyqvExE+Q6X3bXYNZ
 vftIjDmM1mZVDcdu9IyoksT6hLwnW8av4vPhOC9lBNxDnru21TRsa+KQefsY2lME
 180pp77nd529h3n+UY+8aJajb62Rq4hQrLRU053dnUfIRE6hZWOD+Vz32nAfpMqR
 JGOtAfQjIXp/nqfjE8Kfu4ypuD9ZP2X9NPBCUeYT/UrL3XOOiUYj0b0NIXkGeLxr
 9xYfF8K1LwGMi4941kQ7J9VvNRsCRj1eVVYQqzP/oa3JLmGrU2h2m+JzjUjaczI=
 =0boK
 -----END PGP SIGNATURE-----

Merge branch 'tianon-separate-dockerinit' into dm

Conflicts:
	runtime_test.go