tree f993d98d3693a7ca0494b45d261a10d235974d4d
parent eac8c3cda8da2e52b00bf2ba088349eb4ff924d3
parent e0d35c8639fac05051338e4737de6e43d6d0af0c
author Johannes Faltermeier <jfaltermeier@eclipsesource.com> 1456476305 +0100
committer Johannes Faltermeier <jfaltermeier@eclipsesource.com> 1456476352 +0100

Merge commit 'e0d35c8639fac05051338e4737de6e43d6d0af0c'

Change-Id: I922b4ef484b88f657efd14c2af2b9b27c506b7ca
Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>