Merge branch '2798-go-keep-client' into 1885-keep-proxy refs #1885
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 21 May 2014 20:14:03 +0000 (16:14 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 23 May 2014 19:53:41 +0000 (15:53 -0400)

Trivial merge