Paulus Schoutsen 0cc0369faa Merge branch 'next'
Conflicts:
	source/_components/binary_sensor.template.markdown
2016-06-07 19:31:21 -07:00
..
2016-06-07 19:31:21 -07:00
2016-04-16 15:06:08 -07:00
2016-05-28 10:58:01 +02:00
2016-04-16 15:06:08 -07:00