Joe Beda 66d287f7e4 Merge branch 'rename-to-kube' of https://github.com/eparis/kubernetes into eparis-rename-to-kube ...

* 'rename-to-kube' of https://github.com/eparis/kubernetes:
  rename kube server binaries to kube-

Conflicts:
	docs/salt.md

2014-11-17 09:52:10 -08:00

..

proxy.go

Merge branch 'rename-to-kube' of https://github.com/eparis/kubernetes into eparis-rename-to-kube

2014-11-17 09:52:10 -08:00