tree 04f88532f5337127337d65efc3c083016f6dbf57
parent d93736f81ba65edd33a5751ce3c7e8dafe2a9c23
parent 0f13adc0bb04cea1578c5d86db5328324f2db05a
author David Pursehouse <dpursehouse@collab.net> 1542258013 -0800
committer David Pursehouse <dpursehouse@collab.net> 1542258013 -0800

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Add Marco Miller as a developer in pom.xml files
  Set version to 2.14.17

Change-Id: I1585c5c70ffdc7d2eee4be7138e7b3f98302beae