Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 14 May 2015 13:45:04 +0000 (14:45 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 14 May 2015 13:45:04 +0000 (14:45 +0100)
commitb57223d7014a1d1b70a9ca783d35b03d5f07124f
tree9302122065ba7fd08c7e5c215ec38acb34d20fa8
parent1c4f87ca2849ae49d6083a5a279d870aee52b5a3
parentdb31c8995e95373245b65549f7df53e1b0e0bc23
Merge branch 'dbus-1.8'

Conflicts:
NEWS
NEWS