[Merge] lp:~mfrey/powerd/filter-proximity into lp:powerd

[PS Jenkins bot]

Review: Approve continuous-integration

PASSED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/powerd-ci/168/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/powerd-utopic-armhf-ci/20/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/powerd-ci/168/rebuild

-- 
https://code.launchpad.net/~mfrey/powerd/filter-proximity/+merge/237338
Your team Ubuntu Phablet Team is subscribed to branch lp:powerd.