Merge branch 'master' of mjesec.ffzg.hr:/git/vaillant-thermostat
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 8 Aug 2017 12:18:38 +0000 (14:18 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 8 Aug 2017 12:18:38 +0000 (14:18 +0200)

Trivial merge