projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 896d01e d9ca40a)
Merge branch '4869-keepproxy' refs #4869
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 29 Dec 2014 20:11:05 +0000 (15:11 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 29 Dec 2014 20:11:05 +0000 (15:11 -0500)

Trivial merge