tree 7efa2c58bab9848e17992322a6add7a8a52f7657
parent 91d9db79b55fffa0abcf791707b89cdfaf32c105
parent bcbe9b4e84003d10e6ee5753d6980f66f8d06384
author Paladox <thomasmulhall410@yahoo.com> 1509062149 +0100
committer Paladox <thomasmulhall410@yahoo.com> 1509062154 +0100

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Cross out gerrit_api_maven_local in WORKSPACE

Change-Id: I9e77e120a0ce1818a9177b990cf37e0b3c31a2af