tree 5ea97d6558ddf47f4e0c81a9bb242b017a2b428f
parent 45667920d19cd3be4f3d88074851ad5db48a008e
parent 730ed08ab6318b166de2ed2d7e5ab1aa49c5ac39
author margaretha <margaretha@ids-mannheim.de> 1517419998 +0100
committer margaretha <margaretha@ids-mannheim.de> 1517420138 +0100

Merge commit 'refs/changes/80/1580/1' from gerrit into dev

# Conflicts:
#	lite/pom.xml

Change-Id: Ibe2b0331cbefbe2879dbd971cf3b26c3b2046586