Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 27 Mar 2012 13:52:24 +0000 (14:52 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 27 Mar 2012 13:52:24 +0000 (14:52 +0100)
commit2460ddfdb2c1980226593e1af42117b38d5be7dc
tree716e5aaa81a315eef841ad449d68eb21dd593726
parentf67f45979b48ce63fb82179a7ec261e5e3ec3395
parent6edbb08b0ee52096b54c496ef33df684642a02f8
Merge branch 'dbus-1.4'

Conflicts:
NEWS
configure.ac
NEWS
dbus/dbus-sysdeps.c