tree 5d644dd34e4444a63da1c25a26f7490e748a4499
parent ca836deb4dfe8d8bf87b030d91b7f008a3b944e7
parent 7392c091463c5625e221f7519c26897749dd6905
author David Pursehouse <dpursehouse@collab.net> 1560388541 +0900
committer David Pursehouse <dpursehouse@collab.net> 1560388541 +0900

Merge branch 'stable-3.0'

* stable-3.0:
  Set version to 2.15.14

Change-Id: Idffae3b4fc78e1cfd45d3677ab7fa59ca4de233b