Merge remote-tracking branch 'origin/master' into master
[enigma2-plugins.git] / webcamviewer / src / __init__.py