5824: Merge branch 'master' into 5824-keep-web
authorTom Clegg <tom@curoverse.com>
Thu, 29 Oct 2015 20:31:37 +0000 (16:31 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 29 Oct 2015 20:31:37 +0000 (16:31 -0400)
commit6e76e3322d66f609dabcd34c98cba34bd739e089
treedaabbed6db8917a0d64cc2f70d7d4d37afa01ae6
parente3a1bf022cbc081cf7c7ebb441dc1ab1df200f98
parentd70d9b256c5268f6aac6ef1952ac7d5381ee6e46
5824: Merge branch 'master' into 5824-keep-web
doc/_config.yml
sdk/go/keepclient/keepclient.go
sdk/go/keepclient/support.go
services/keepproxy/keepproxy.go
services/keepproxy/keepproxy_test.go