[Debian-iot-packaging] [openzwave-controlpanel] 51/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 3a90176725942535c5d8b6abc0cafbab25c7ba65
Merge: b34940c c243d37
Author: Justin Hammond <justin at dynam.ac>
Date:   Fri Jul 3 14:15:55 2015 +0800

    Merge branch 'master' into New-CC

 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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