++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
Merge branch 'master' of github.com:telmich/cdist
++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>