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)
commit0786e46318ebc9263a646960ebc742a40196d9ce
tree738705257edb781df8b5346b24aea001a87d64ef
parent0e0111304eaf28a4e86c67baecbfeed217393034
parent88f8d44aed231729f7e6ed70d4a46dc4aad59975
Merge branch 'master' of git+ssh://git.freedesktop.org/git/dbus/dbus