Stephan Raue 40b4df7067 Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2
Conflicts:
	packages/mediacenter/xbmc/patches/12.2-ad84e88/todo/xbmc-990.26.01-PR2890.patch
	packages/mediacenter/xbmc/patches/12.2-ad84e88/todo/xbmc-990.26.02-PR2890.patch
	packages/mediacenter/xbmc/patches/12.2-ad84e88/todo/xbmc-990.26.03-PR2890.patch
	packages/mediacenter/xbmc/patches/12.2-ad84e88/todo/xbmc-990.26.04-PR2890.patch
	packages/tools/bcm2835-bootloader/package.mk
2013-07-23 21:29:50 +02:00
..