merge upstream dev

This commit is contained in:
Joseph Hughes committed 2016-01-16 12:52:22 -07:00
commit 0495776a22
22 files changed
+601 -221

No files matched your search

@@ -46,7 +46,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
)
class NestBinarySensor(BinarySensorDevice, NestSensor):
class NestBinarySensor(NestSensor, BinarySensorDevice):
""" Represents a Nst Binary sensor. """
@property