[Merge] lp:~robru/qml-friends/fix-replaces into lp:qml-friends

[Robert Bruce Park]

Robert Bruce Park has proposed merging lp:~robru/qml-friends/fix-replaces into lp:qml-friends.

Commit message:
Better Conflicts/Replaces/Provides for recent rename.

Requested reviews:
  miRv (mirv)

For more details, see:
https://code.launchpad.net/~robru/qml-friends/fix-replaces/+merge/181462
-- 
https://code.launchpad.net/~robru/qml-friends/fix-replaces/+merge/181462
Your team Super Friends is subscribed to branch lp:qml-friends.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 687 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20130822/ec65d632/attachment.diff>