Merge branch 'master' of /home/gustavo/Development/git/python-lightmediascanner
drwxr-xr-x - lightmediascanner
drwxr-xr-x - python-lightmediascanner