xfce4-settings nick/xsettingsd-merge ready for merge

[Jannis Pohlmann]

Hey,
On Fri, 25 Feb 2011 10:40:42 +0100
Nick Schermer <nickschermer at gmail.com> wrote:

> I've just finished the last bit in the branch so I think it's ready to
> be merged in master. A small summary of what the changes are:

(snip lots of good stuff)

> So, any complains this will be merged?

Nope, looks fine to me. Haven't looked at the code really but I trust
you in that regard.

  - Jannis