[Merge] lp:~mandel/ubuntu-download-manager/fix-dbus-merge into lp:ubuntu-download-manager

[Manuel de la Peña]

Manuel de la Peña has proposed merging lp:~mandel/ubuntu-download-manager/fix-dbus-merge into lp:ubuntu-download-manager.

Requested reviews:
  Ubuntu Phablet Team (phablet-team)

For more details, see:
https://code.launchpad.net/~mandel/ubuntu-download-manager/fix-dbus-merge/+merge/243260

Fix merge issues with trunk.
-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~mandel/ubuntu-download-manager/fix-dbus-merge into lp:ubuntu-download-manager.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 22304 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20141201/a2f974e5/attachment-0001.diff>