tree f3b81c629297eda2bc2371a7d95ef05c87845440
parent f7ae1acf4efea7bafdf3e0412918e4369289177b
parent 1dc8297eea797642c5b4b5d8d669406db5f07214
author Paladox <thomasmulhall410@yahoo.com> 1554496007 +0100
committer Paladox <thomasmulhall410@yahoo.com> 1554496007 +0100

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Fix Quota rest rate limiter support

Change-Id: Ib83ceba1ecd42a1cb0bb09575e242d244b0ce78c