tree e6fc34b2c56c59fad4288daf45da80780a24171e
parent 713906b550b520f11d3ba14d7f522a5ef7044df1
parent 45182fea5507334437bee5cc1d1ed5b23e5b6ba2
author David Pursehouse <dpursehouse@collab.net> 1555647329 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555647329 +0900

Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Set version to 2.13.14

Change-Id: I502a32bd4ad31483c1675aae91709ef50e693cd3