Merge branch 'master' of mjesec.ffzg.hr:/git/vaillant-thermostat
authorDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 14 Oct 2016 12:35:47 +0000 (14:35 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 14 Oct 2016 12:35:47 +0000 (14:35 +0200)

Trivial merge