packaging for debian
Merge branch 'master' of https://github.com/MBach/Miam-Player

Conflicts:
	packaging/debian/miam-player/usr/share/applications/Miam-Player.desktop