[Debian-iot-packaging] [openzwave-controlpanel] 48/81: Merge branch 'master' into New-CC

[Dara Adib]

This is an automated email from the git hooks/post-receive script.

daradib-guest pushed a commit to branch debian/master
in repository openzwave-controlpanel.

commit d21efeacb3927b973b5cbf5d48772e4a58f60cf4
Merge: 1f98f49 bfe261b
Author: Justin Hammond <justin at dynam.ac>
Date:   Tue Jun 30 14:41:04 2015 +0800

    Merge branch 'master' into New-CC

 cp.html       | 1 +
 cp.js         | 5 ++++-
 webserver.cpp | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/openzwave-controlpanel.git