Daniel Nephin 2b75741e5a Fix cherry-pick errors.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-11 14:22:35 -04:00
..
2015-07-03 14:14:47 +01:00
2015-09-11 14:22:35 -04:00
2015-09-11 14:22:35 -04:00