projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad7c6e1 340a9ff)
Merge branch 'master' into 6445-incorrect-task-runtime-calc
authorradhika <radhika@curoverse.com>
Mon, 13 Jul 2015 20:26:08 +0000 (16:26 -0400)
committerradhika <radhika@curoverse.com>
Mon, 13 Jul 2015 20:26:08 +0000 (16:26 -0400)

Trivial merge