4 commits

Author	SHA1	Message	Date
Fabian Affolter	81f9dd1cc6	Merge branch 'current' into next	2017-07-30 09:42:05 +02:00
Fabian Affolter	7679ed3723	Update 'ha_release'	2017-07-29 22:53:20 +02:00
Colin O'Dell	0da912651d	Add documentation on the manual_mqtt alarm (#2921)	2017-07-29 22:25:20 +02:00
Colin O'Dell	3a225221f4	Add documentation on the manual_mqtt alarm (#2921)	2017-07-29 21:56:10 +02:00