Merge branch 'pr/78' into dev

Conflicts: homeassistant/const.py
2016-01-26 21:07:53 -08:00
parent 14cd27aaa7 ef76047ba2
commit 88387d3123
2 changed files with 96 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,11 @@ nosetests.xml

 .python-version

+# emacs auto backups
+*~
+*#
+*.orig
+
 # venv stuff
 pyvenv.cfg
 pip-selfcheck.json