coreos/etcd — pull request #1372 by jonboulle (2014-10-23 22:35:01+00:00)
Title: main: fix proxy initialization and setupCluster

Fixes #1360 and a bug in NewClusterFromString.