tree d7b20c959ee398d86731d2b05d0d3dc8f7691cda
parent 34b21c96a7aeb8a08185245cebe3b100bc506fd0
parent c761283a68a55e42d76a5f8ac49a013e4db95727
author Christofer Dutz <christofer.dutz@c-ware.de> 1511426058 +0100
committer Christofer Dutz <christofer.dutz@c-ware.de> 1511426058 +0100

Merge branches 'develop' and 'feature/pre-release-finetuning' of https://git-wip-us.apache.org/repos/asf/incubator-edgent into feature/pre-release-finetuning