[Merge] ~khurshid-alam/ubuntu/+source/rhythmbox:master into ~ubuntu-desktop/ubuntu/+source/rhythmbox:ubuntu/master

[Jeremy Bicha]

Review: Needs Fixing

Khurshid, have you ever used git-buildpackage's patch-queue feature (gbp pq)?

https://wiki.ubuntu.com/DesktopTeam/git#Pick_some_upstream_commits
https://manpages.debian.org/unstable/gbp-pq

Specifically, we don't edit upstream directly, but we use debian/patches/ so gbp pq helps create and modify those patches.
-- 
https://code.launchpad.net/~khurshid-alam/ubuntu/+source/rhythmbox/+git/rhythmbox/+merge/362491
Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/rhythmbox:ubuntu/master.