tree 2264bb7fc71675ea6a810dd8d416aff7ddeacdb5
parent f2e78d4042490178a9cc1da59fc590dec55278cb
parent 4acaf5a7b4d28e1fab3ebc718c949768fb62b21c
author David Pursehouse <dpursehouse@collab.net> 1501580975 +0200
committer David Pursehouse <dpursehouse@collab.net> 1501580979 +0200

Merge branch 'stable-2.14'

* stable-2.14:
  Upgrade API to 2.14.2

Change-Id: I4ad7a012e6ba9cb6f857e2ce59acc9f182409de0