fix put ttl
Merge pull request #275 from xiangli-cmu/fix-put-ttl

Fix put ttl
Merge branch '0.2' of https://github.com/coreos/etcd into versioning

Conflicts:
	server/v2/put_handler.go