Trivial formatting correction
Merge pull request #592 from Plasma/patch-1

Trivial formatting correction
feat(Documentation/api): document file upload

This gets asked about a lot int IRC/mailinglist/etc. Fixes this issue:
https://github.com/coreos/etcd/issues/383#issuecomment-31183603
Merge pull request #596 from philips/add-file-upload-docs

feat(Documentation/api): document file upload
fix(mod/lock): correct watch index to remove cpu load

The waitIndex was being pulled from the wrong node in the lock parent which caused the watch to be returned immediately. This caused a continuous set of calls while a client was waiting for a lock.
Merge pull request #593 from benbjohnson/lock-fix

fix(mod/lock): correct watch index to remove cpu load
fix(README): remove the drone.io badge

the drone.io badge is either cached wrong by github or links to a wrong version when we build a branch, just remove it.
fix(discovery): remove its own address from peer list to join
fix(tests/multi_node_kill_all_and_recovery): wait for cluter to build over
fix(transporter): CancelRequest doesn't work on HTTPS connections blocked

Currently this is a workaround. And it should be fixed in Go1.3.
chore(server): remove useless CancelWhenTimeout

Setting request timeout is covered by go-httpclient now.
Merge pull request #598 from unihorn/19

fix bugs that are found in issue #579
fix(Documentation/*): fix various typos
Merge pull request #604 from ccding/master

fix trivial issues as I see them
docs(errorcode.md): add the EcodeRootROnly error
Add PHP library.

We implement the api client useing php.
Merge pull request #612 from congpeijun/master

Add PHP library.
Merge pull request #607 from Asmod4n/patch-1

Added Error 107 to Documentation
docs(CONTRIBUTING): add code style section
Merge pull request #613 from unihorn/29

docs(CONTRIBUTING): add code style section