projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb2099b 4d15428)
Merge branch 'master' into 4844-stricter-min-nodes-wip
authorWard Vandewege <ward@curoverse.com>
Tue, 23 Dec 2014 20:47:23 +0000 (15:47 -0500)
committerWard Vandewege <ward@curoverse.com>
Tue, 23 Dec 2014 20:47:23 +0000 (15:47 -0500)

Trivial merge