tree 7881f7423d692faa57389b0a23c080802e148663
parent 6050ec42ac3bac28a73294aedcfca94d9b987b02
parent d626115b888f0a52e7de7ffd82f96a9e769b37a3
author Christofer Dutz <christofer.dutz@c-ware.de> 1520767204 +0100
committer Christofer Dutz <christofer.dutz@c-ware.de> 1520767204 +0100

Merge branch 'EDGENT-447' of https://github.com/yanghua/incubator-edgent into develop