]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 6 Jan 2014 16:30:34 +0000 (16:30 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 6 Jan 2014 16:30:34 +0000 (16:30 +0000)

Trivial merge