projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 976e8b2 84eaf88)
Merge branch 'master' into origin-2883-job-log-viewer
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 18 Jun 2014 14:05:00 +0000 (10:05 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 18 Jun 2014 14:05:00 +0000 (10:05 -0400)

Trivial merge