Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 2 Nov 2011 15:31:09 +0000 (15:31 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 2 Nov 2011 15:31:09 +0000 (15:31 +0000)
commita2c623b881f605619f3f4965aff123689cacf9bf
treee3907beccb42233405d1563516224fbf19db8e55
parent2214ad00c31abca64dda48c0724286b6b2c4da9c
parenta36d4918a6f646e085fd91c7cdb41b093feef7ac
Merge branch 'dbus-1.4'
dbus/dbus-sysdeps-unix.c
test/Makefile.am