Merge branch '5824-keep-web' into 5824-keep-web-workbench
authorTom Clegg <tom@curoverse.com>
Fri, 30 Oct 2015 18:30:13 +0000 (14:30 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 30 Oct 2015 18:30:13 +0000 (14:30 -0400)
commita4acb3ae95b2fc7f4b5f1e174c910a54cc6681da
treeeadbdf026c8ccb29365eac9b0d0960f2f88a1391
parent0f535af4fbcb7a9f6ca1e25675b31cc9656d88f3
parent87640a81e725d0246837994acbb3a696d14401c6
Merge branch '5824-keep-web' into 5824-keep-web-workbench

Conflicts:
sdk/python/tests/run_test_server.py
services/keepproxy/keepproxy_test.go
sdk/python/tests/nginx.conf
sdk/python/tests/run_test_server.py
services/keepproxy/keepproxy.go
services/keepproxy/keepproxy_test.go