tree 868df12f21f2c23b54859d5845a475c5cba910c6
parent 147e2951d7faff22f3fc5a7717596fd57b7a5a64
parent 4b12bb0979b18956bf887d7b369c8da3f2b02f17
author David Pursehouse <dpursehouse@collab.net> 1504852593 +0900
committer David Pursehouse <dpursehouse@collab.net> 1504852597 +0900

Merge branch 'stable-2.14'

* stable-2.14:
  GlobalPluginConfig: Fix typo in Javadoc

Change-Id: Ia30fe1ad5cd967d0c24e3e3deefa8f0ce687c6e9