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)
commit744ca00ccd1e7fda9d4210b18c1f4a734f3b2261
tree1803cba5e1b16cb071432c7fc5a85b8bdae07ac1
parentcd85fc2c07a0e9d8c34b81e4523ee3d1ebd696e9
parent3ba5aa15ea0156a4fce63dcb43b7f972b4c760df
Merge branch '2798-go-keep-client' into 1885-keep-proxy refs #1885