Merge proposals dependent on lp:~ripsax/xbmc/Junichi

lp:~ripsax/xbmc/Junichi has no merge proposals.