Files
Arch-R/projects
Stephan Raue db0d859e33 Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-systemd
Conflicts:
	packages/network/avahi/init.d/53_avahi
	packages/network/bluez/init.d/55_obexd
	packages/network/openssh/init.d/51_sshd
	packages/network/openssh/scripts/sshd-keygen
	packages/network/samba/scripts/52_samba
	packages/x11/xserver/xorg-server/profile.d/xorg-server.conf
2013-08-19 16:01:42 +02:00
..