tree 41ac7fe9c474955f4a561432dcac4faa6e56465b
parent de0827f6bd5f9507c4b36c0925d401677acea428
parent 17893ee37abcd00bb80d0a42c840b711617b1696
author Paladox <thomasmulhall410@yahoo.com> 1509110572 +0100
committer Paladox <thomasmulhall410@yahoo.com> 1509110579 +0100

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Remove explicit dependency on PLUGIN_DEPS

Change-Id: Ic3e930f27f2a79aecb7dcb5c6a41c1ce71a5c6d2