tree e4725c68570c8c64f1077039b0c0ce2e22f609ff
parent d098aa4ead27992261c1c1c30ddab283df9ca08c
parent aaff59efeb4801e6af011717d8290c6bb2ffcf05
author Paladox <thomasmulhall410@yahoo.com> 1525803750 +0100
committer Paladox <thomasmulhall410@yahoo.com> 1525803750 +0100

Merge branch 'stable-2.15'

* stable-2.15:
  At least get tests compiling properly

Change-Id: Iecbd178c51bdccdab9013a1027422739f164c15e