tree bb1a36172847f930f123b9755ffedb242a626581
parent 7ecf39873e9bda3cd45f6185b5b816c6eac71a55
parent ebec87f14b5d1801e5c3d182e5370160df1e4167
author Paladox <thomasmulhall410@yahoo.com> 1553617542 +0000
committer Paladox <thomasmulhall410@yahoo.com> 1553617567 +0000

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Add missing 'Gerrit-HttpModule' to BUILD

Change-Id: Ia0fbe58754d09caadd1786ea9c73fd70be64e248