Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4
authorRalf Habacker <ralf.habacker@freenet.de>
Wed, 21 Dec 2011 19:22:53 +0000 (20:22 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Wed, 21 Dec 2011 19:22:53 +0000 (20:22 +0100)
commit59a378fce2815615264e69f20a7d6cb320c350a5
treea3af530ef3e29bb239b82e556a10eeb1e093eb01
parent7aed4eb923b3c6a8aafcdb9a4e35a0924005c833
parenta36d4918a6f646e085fd91c7cdb41b093feef7ac
Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4