Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 22 Aug 2013 17:03:59 +0000 (18:03 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 22 Aug 2013 17:03:59 +0000 (18:03 +0100)
commiteca135456b5a8f695fdcd31769cdd475885236f5
tree33a36f28306b32cccbb184b2fa357dbbd4966077
parent039758ca6987ebd20f6535af3e06deac9cb604d3
parent5ad2668fb36e8ab2664e7a8f044f3a8b7ca96b0b
Merge branch 'dbus-1.6'

Conflicts:
NEWS