Merge branch 'master' into v1.0
[psensor.git] / ChangeLog