]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Merge branch 'master' of git+ssh://git.freedesktop.org/git/dbus/dbus
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 9 Aug 2012 11:37:25 +0000 (12:37 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 9 Aug 2012 11:37:25 +0000 (12:37 +0100)

Trivial merge