Viewing all changes in revision 142.

Committer: CI Train Bot
Author(s): Ken VanDine
Date: 2015-01-22 20:28:05 UTC
mfrom: <a title="Merged From 138.3.1" href="/~mandel/content-hub/rebuild-new-udm-rtm/revision/138.3.1">(138.3.1 lp1394211)
Revision ID: ci-train-bot@canonical.com-20150122202805-einvisn8sqvbxiok

Fixed conflict with nih-dbus and our own i18n wrapper
Fixes: #1394211
Approved by: Michael Sheldon

added added

removed removed

~mandel/content-hub/rebuild-new-udm-rtm