2 commits

Author	SHA1	Message	Date
Paulus Schoutsen	3709840327	Merge branch 'dev' into component-recorder ... Conflicts: homeassistant/components/http/__init__.py	2015-01-31 10:31:16 -08:00
Paulus Schoutsen	7c45318c00	Recorder component: proof of concept	2015-01-28 00:22:09 -08:00