Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 8 Oct 2013 17:42:12 +0000 (18:42 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 8 Oct 2013 17:42:12 +0000 (18:42 +0100)
commit76c5deff5c50c118e40fcfd245f60f1b4f7c4cbd
treeaafe5d7f1a0cb8c9d148b03fa987b947920d6c23
parentcd32cdde0ea8b953abca6e363a0b3998b9d7c06a
parenta96207da085b8fa3e2c15ab729d523a347459ea8
Merge branch 'dbus-1.6'

Conflicts:
NEWS
configure.ac