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

This commit is contained in:
Stephan Raue 2013-02-16 21:08:14 +01:00
commit d5e50c3a5e