Merge branch 'current' into next

This commit is contained in:
Paulus Schoutsen 2017-01-28 15:21:21 -08:00
commit c693f7425a
19 changed files with 2180 additions and 267 deletions

View file

@ -17,4 +17,3 @@ Details about the latest release can always be found at:
- [Release blog posts](https://home-assistant.io/blog/categories/release-notes/)
- [GitHub releases](https://github.com/home-assistant/home-assistant/releases)
- [Python Package Index](https://pypi.python.org/pypi/homeassistant/)