projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8815915
2099a0a
)
Merge branch 'master' into 1885-keep-proxy refs #1885
author
Peter Amstutz <peter.amstutz@curoverse.com>
Fri, 23 May 2014 14:27:59 +0000
(10:27 -0400)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Fri, 23 May 2014 19:54:01 +0000
(15:54 -0400)
Trivial merge
projects / arvados.git / commitdiff