Milos Kozak 0e21b67a42 fix merge conflicts		2017-01-17 18:00:44 +01:00
..
nightscout	fix merge conflicts	2017-01-17 18:00:44 +01:00