Merge branch 'frodo' of https://github.com/opdenkamp/xbmc-pvr-addons into frodo
Merge branch 'frodo' of https://github.com/opdenkamp/xbmc-pvr-addons into frodo
Merge remote-tracking branch 'origin/frodo' into frodo