tree e798f20bd3853646db35919d0fad4bdd4d12e201
parent 6b9abca6f337bbb33d51002782ad65f337a086a7
parent 9bcba44b6a6cf5b0332ed33c9da7ac81e079692f
author Nick Wellnhofer <wellnhofer@aevum.de> 1470051526 +0200
committer Nick Wellnhofer <wellnhofer@aevum.de> 1470051526 +0200

Merge branch 'host-data-json'

Fixes CLOWNFISH-83.