tree c9087d63e8167d5a286afd00839082b79c032e26
parent fae0d9abe25703fc9cd1d192692da3c0f8193bfb
parent 96e0b5fcb61f78df75ac68677ac4d37dc1e60502
author David Pursehouse <dpursehouse@collab.net> 1548317060 +0900
committer David Pursehouse <dpursehouse@collab.net> 1548317060 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Docs: Add rabbitmq plugin to config-plugins.txt

Change-Id: I9985a9d1661fa8eaf3fb4d07e3d3f52d26405fba