gettext: do not use emacs
xbmc: add PR2505
Merge remote-tracking branch 'upstream/master' into openelec-settings
xbmc-addon-settings: update to xbmc-addon-settings-0.1.6
Merge remote-tracking branch 'upstream/openelec-linux-next' into openelec-settings
Merge pull request #2139 from vpeter4/stuff

gettext: do not use emacs
Merge remote-tracking branch 'upstream/master' into openelec-settings
xf86-video-nvidia: upadte to xf86-video-nvidia-310.40
connman: update to connman-baa5515
Merge branch 'openelec-settings' of github.com:OpenELEC/OpenELEC.tv into openelec-install