Merge branch 'Gotham' of https://github.com/Owersun/xbmc into Gotham-odroid-owersun
Merge branch 'Gotham-odroid-owersun' of github.com:PimentNoir/xbmc into Gotham-odroid-owersun