Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-systemd

Conflicts:
	packages/sysutils/systemd/scripts/openelec-debugconfig
	packages/sysutils/timezone-data/package.mk
	packages/sysutils/timezone-data/scripts/tzdata-setup
	packages/sysutils/udisks/scripts/udisks-mount-disks
	packages/tools/installer/package.mk
	packages/x11/other/ratpoison/package.mk
This commit is contained in:
Stephan Raue
2013-08-13 01:40:40 +02:00

Diff Content Not Available