V67+: Merge branch 'guymcswain-keepalive'
authorjoan <joan@abyz.me.uk>
Sun, 21 Oct 2018 08:29:11 +0000 (09:29 +0100)
committerjoan <joan@abyz.me.uk>
Sun, 21 Oct 2018 08:29:11 +0000 (09:29 +0100)
commitfe4a2675aa59dea93f3be46e0d69d39ca9ab9a06
tree2e0300495b1ec3ef944203d2393bf01a9c8258bd
parent06c74e759c894d57a33748c3e6a0cae1c726ada9
parentf0beff07ea245ff9c1a8233a5b6c7e76610509b7
V67+: Merge branch 'guymcswain-keepalive'