[Merge] lp:~panfaust/kubuntu-packaging-next/kmediaplayer-work2 into lp:~kubuntu-packagers/kubuntu-packaging-next/kmediaplayer

[Scarlett Clark]

Review: Needs Fixing

Something funky going on with the changelog. Looks like you want to merge a bzr conflict?

-- 
https://code.launchpad.net/~panfaust/kubuntu-packaging-next/kmediaplayer-work2/+merge/226827
Your team Kubuntu Packagers is subscribed to branch lp:~kubuntu-packagers/kubuntu-packaging-next/kmediaplayer.