tree dd8e10066d3391e9c5c7cabc74e846f44fca1d29
parent 61c52b30c32beeb56ca8bebd93f9abac3cf4cf1a
parent 1a844e42b1129f81ff83fdb1b0f215923f437795
author Alexander Thomas <athom@google.com> 1571932342 +0200
committer Alexander Thomas <athom@google.com> 1571932342 +0200

Version 2.6.0

Merge commit '1a844e42b1129f81ff83fdb1b0f215923f437795' into stable