Amending changelog after git conflict
Amending changelog after git conflict

nedmech/qlcplus,sbenejam/qlcplus,nedmech/qlcplus,joepadmiraal/qlcplus,kripton/qlcplus,kripton/qlcplus,mcallegari/qlcplus,kripton/qlcplus,nedmech/qlcplus,joepadmiraal/qlcplus,nedmech/qlcplus,bjlupo/rcva_qlcplus,peternewman/qlcplus,sbenejam/qlcplus,mcallegari/qlcplus,sbenejam/qlcplus,peternewman/qlcplus,kripton/qlcplus,mcallegari/qlcplus,joepadmiraal/qlcplus,peternewman/qlcplus,plugz/qlcplus,bjlupo/rcva_qlcplus,nedmech/qlcplus,sbenejam/qlcplus,kripton/qlcplus,peternewman/qlcplus,bjlupo/rcva_qlcplus,plugz/qlcplus,joepadmiraal/qlcplus,joepadmiraal/qlcplus,sbenejam/qlcplus,mcallegari/qlcplus,sbenejam/qlcplus,bjlupo/rcva_qlcplus,plugz/qlcplus,mcallegari/qlcplus,joepadmiraal/qlcplus,peternewman/qlcplus,mcallegari/qlcplus,bjlupo/rcva_qlcplus,bjlupo/rcva_qlcplus,plugz/qlcplus,sbenejam/qlcplus,kripton/qlcplus,mcallegari/qlcplus,plugz/qlcplus,peternewman/qlcplus,kripton/qlcplus,nedmech/qlcplus,plugz/qlcplus,plugz/qlcplus