tree ece1367a65ef32ac344de43df632cb8e14ed4b36
parent 35c016d2cf8db8f944e43b624a8840fdf0be46a4
parent a03b2c3a77055f28c58dcfe2a2f1acd10d1cdeb3
author Paladox <thomasmulhall410@yahoo.com> 1522359979 +0100
committer Paladox <thomasmulhall410@yahoo.com> 1522359979 +0100

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix dependency management for tests

Change-Id: Ia229ef95fc2a009621494a18ecf156cee757e25f