Merge branch '0.2' into config

Conflicts:
	Documentation/external-documentation.md
	server/config.go
	server/config_test.go
	server/tls_info.go
	server/util.go

server/config.go

@@ -47,6 +47,7 @@ type Config struct {
 		CertFile      string `toml:"cert_file" env:"ETCD_PEER_CERT_FILE"`
 		KeyFile       string `toml:"key_file" env:"ETCD_PEER_KEY_FILE"`
 		ListenHost    string `toml:"listen_host" env:"ETCD_PEER_LISTEN_HOST"`
+
 	}
 }
 
@@ -55,6 +56,7 @@ func NewConfig() *Config {
 	c := new(Config)
 	c.SystemPath = DefaultSystemConfigPath
 	c.AdvertisedUrl = "127.0.0.1:4001"
+	c.AdvertisedUrl = "127.0.0.1:4001"
 	c.DataDir = "."
 	c.MaxClusterSize = 9
 	c.MaxResultBuffer = 1024

server/util.go

@@ -44,4 +44,3 @@ func trimsplit(s, sep string) []string {
   }
   return trimmed
 }
-