Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 10 Jun 2014 17:36:00 +0000 (18:36 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 10 Jun 2014 17:36:00 +0000 (18:36 +0100)
commita261ec66952722bd79e163d29360b77dee31481d
tree944cb9ab8c9564c58c5f1969f5ba8f3d46fce4a2
parent6e21873d6331de86e88fd47dfb80af2696e6ff39
parentc3650785feef855647f5424e6331a791f4f22f97
Merge branch 'dbus-1.8'

Conflicts:
NEWS
configure.ac
NEWS
configure.ac