Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 9 Aug 2012 11:32:32 +0000 (12:32 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 9 Aug 2012 11:32:32 +0000 (12:32 +0100)
commit0e0111304eaf28a4e86c67baecbfeed217393034
treea1c8cce0a6e79a2a6bce716bbe6dd667aec2c469
parent55024f65a6d20ba268c96b5d42f8084c31e6a6f3
parent9436816175060f038af9c06cf135246f955f9ed4
Merge branch 'dbus-1.6'

Conflicts:
NEWS
configure.ac
NEWS
configure.ac