Merge branch 'master' into ppa-daily-trunk
[psensor-pkg-ubuntu.git] / ChangeLog