tree e549e9f0d214db56e7f793e82d0a419ab3319138
parent e3fe2f2a8d65fa76db519e046fcad7d6461f17d8
parent 2be46a56a812f62f296c95109793c87c8fc64bc2
author David Pursehouse <dpursehouse@collab.net> 1560388454 +0900
committer David Pursehouse <dpursehouse@collab.net> 1560388454 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Set version to 2.15.14

Change-Id: Id7fdc8011fb4b9b303cd8225b59c77ff81d85aed