Merge branch 'master' of mjesec.ffzg.hr:/git/vaillant-thermostat
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 12 Mar 2017 10:33:46 +0000 (11:33 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 12 Mar 2017 10:33:46 +0000 (11:33 +0100)
commite49e2a6d2d52684e6e42dea66e0d3bd3015703ca
treef2c8408114f26e0dc0c8a16584c4d578ce829e17
parent73023bd714c9f7c3f3055a1c2153aee6349ed928
parent61f935b342cee696423bbcdeca7b03c1f42335bc
Merge branch 'master' of mjesec.ffzg.hr:/git/vaillant-thermostat

Conflicts:
parse.pl
parse.pl