Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 28 Jun 2013 10:38:33 +0000 (11:38 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 28 Jun 2013 10:38:33 +0000 (11:38 +0100)
commit00243960027c202f2efe7f0c143c3a19aee3597b
tree90cea90e702c6e381ed09788cce2adb7429149dc
parent5fdb93a49c6b66f6461d4842821cb51d6e58658e
parent160fbc9ec110fc3aa691b86971b50ee8dc740783
Merge branch 'dbus-1.6'

Conflicts:
NEWS
NEWS