Merge branch 'heatcontroll_config' of https://github.com/balloob/home-assistant into heatcontroll_config

This commit is contained in:
Daniel Hoyer Iversen 2015-12-01 11:09:47 +01:00
commit 9bd11205fb

Diff Content Not Available