Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 28 Jun 2012 15:50:23 +0000 (16:50 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 28 Jun 2012 15:50:23 +0000 (16:50 +0100)
commit0c40800505899f20946ad59317d28e0e5a25ad41
treeb86fd0cc4e378d33a282f832d7dd9accc75e1a4d
parenteb2300b593e585857f55a05826f3b63cb035a11d
parent4f6d717197d225af36bb7dd191e504c9c6a4dfb8
Merge branch 'dbus-1.6'

Conflicts:
NEWS
configure.ac
NEWS
configure.ac