Viewing all changes in revision 4103.

Committer: CI Train Bot
Author(s): Peter Hutterer
Date: 2015-10-08 16:14:45 UTC
mfrom: <a title="Merged From 4100.2.4" href="/~larsu/unity-settings-daemon/lp1436861/revision/4100.2.4">(4100.2.4 unity-settings-daemon)
Revision ID: ci-train-bot@canonical.com-20151008161445-vvatkcv7zhl3uo20

Backport changes from upstream git and https://bugzilla.gnome.org/show_bug.cgi?id=724789 to better handle XError

added added

removed removed

~larsu/unity-settings-daemon/lp1436861