Sync with upstream

399ceba

Sync with upstream
dae53408 · Erick Hitter · 38a5b77f · dae53408 · dae53408 · dae53408
Verified Commit dae53408 authored 8 years ago by Erick Hitter
--- a/automations/balcony-late-night-dim.yaml
+++ b/automations/balcony-late-night-dim.yaml
--- a/automations/balcony-relax-after-sunset.yaml
+++ b/automations/balcony-relax-after-sunset.yaml
--- a/automations/balcony-sunrise-off.yaml
+++ b/automations/balcony-sunrise-off.yaml
--- a/automations/balcony-sunset-on.yaml
+++ b/automations/balcony-sunset-on.yaml
--- a/automations/dining-area-on-at-entry.yaml
+++ b/automations/dining-area-on-at-entry.yaml
--- a/automations/dining-area-timeout.yaml
+++ b/automations/dining-area-timeout.yaml
--- a/automations/dining-area-window-opened-outside.yaml
+++ b/automations/dining-area-window-opened-outside.yaml
--- a/automations/living-room-sunrise-off.yaml
+++ b/automations/living-room-sunrise-off.yaml
--- a/automations/living-room-sunset-on.yaml
+++ b/automations/living-room-sunset-on.yaml
--- a/automations/living-room-timeout.yaml
+++ b/automations/living-room-timeout.yaml
--- a/automations/office-lights-timeout.yaml
+++ b/automations/office-lights-timeout.yaml
--- a/automations/update-notification.yaml
+++ b/automations/update-notification.yaml
--- a/automations/wireless-charger-timeout.yaml
+++ b/automations/wireless-charger-timeout.yaml
--- a/binary-sensors/acceleration-dining-area-window.yaml
+++ b/binary-sensors/acceleration-dining-area-window.yaml
--- a/binary-sensors/acceleration-front-door.yaml
+++ b/binary-sensors/acceleration-front-door.yaml
--- a/binary-sensors/acceleration-master-bedroom-window.yaml
+++ b/binary-sensors/acceleration-master-bedroom-window.yaml
--- a/binary-sensors/acceleration-office-cabinet.yaml
+++ b/binary-sensors/acceleration-office-cabinet.yaml
--- a/binary-sensors/acceleration-office-window.yaml
+++ b/binary-sensors/acceleration-office-window.yaml
--- a/binary-sensors/acceleration-slider.yaml
+++ b/binary-sensors/acceleration-slider.yaml
--- a/binary-sensors/co-gas-living-room.yaml
+++ b/binary-sensors/co-gas-living-room.yaml