adds missing NULL check in CPluginDirectory::SetSetting
[epg] fixed - epg load/update was interrupted when the pvr manager imports channels, leading to delays and channel ids gone missing in certain situations
Merge remote-tracking branch 'origin/master' into android-tegra2-xaf-touch