1. mediabox
	modified:   enigma2-plugin-systemplugins-crossepg.bb
Merge branch 'master' of git://github.com/pli3/openpli3

Conflicts:
	meta-openpli/recipes-openpli/e2openplugins/enigma2-plugin-systemplugins-crossepg.bb