Merge branch '5824-keep-web' into 5824-keep-web-workbench
authorTom Clegg <tom@curoverse.com>
Wed, 4 Nov 2015 04:20:27 +0000 (23:20 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 4 Nov 2015 04:20:27 +0000 (23:20 -0500)
commit767e1199d0e1bdf2b564b5c58a91d29141eb67d7
tree08efe56e85d595a8abbea4aa5b811906f17f4d01
parentce2bf31ba0831d9704f2edf82297f701b3b994df
parent78af1220d9e2ddf4d933d9a9487397414d8a3909
Merge branch '5824-keep-web' into 5824-keep-web-workbench

Conflicts:
services/keepproxy/keepproxy.go
services/keepproxy/keepproxy.go