go-lab/smart-device — pull request #10 by GermanCF (2014-07-25 16:30:18+00:00)
Title: Raspberry pi

Conflicts solved and ready to merge.