]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 14 Jul 2011 15:49:02 +0000 (16:49 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 14 Jul 2011 15:49:02 +0000 (16:49 +0100)

Trivial merge