Viewing all changes in revision 168.

Committer: CI bot
Author(s): Ken VanDine
Date: 2014-11-20 04:22:35 UTC
mfrom: <a title="Merged From 167.1.1" href="/~ps-jenkins/content-hub/ubuntu-vivid-proposed/revision/167.1.1">(167.1.1 lp1394211)
Revision ID: ps-jenkins@lists.canonical.com-20141120042235-d7plbe2stjrp13px

Fixed conflict with nih-dbus and our own i18n wrapper
Fixes: 1394211
Approved by: Michael Sheldon, PS Jenkins bot

added added

removed removed