Merge branch 'current' into next

2016-10-05 15:44:06 -07:00 · 2016-10-05 15:44:06 -07:00 · afdd04e844
commit afdd04e844
parent 55e6b5e922 7932beeed7
63 changed files with 290 additions and 226 deletions
--- a/source/_components/statsd.markdown
+++ b/source/_components/statsd.markdown
@ -6,6 +6,7 @@ date: 2016-01-25 08:00
 sidebar: true
 comments: false
 sharing: true
+logo: statsd.png
 footer: true
 ha_category: "History"
 ha_release: 0.12