projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4e7c6d 5169822)
Merge branch '4869-keepalive' refs #4869
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 5 Jan 2015 16:37:54 +0000 (11:37 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 5 Jan 2015 16:37:54 +0000 (11:37 -0500)

Trivial merge