Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 24 Apr 2013 19:31:28 +0000 (20:31 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 24 Apr 2013 19:31:28 +0000 (20:31 +0100)
commit1f3b479a120002b61d9000828370d743a1d854af
tree821beaa1962b7e19650619d3140c763f2e9c3a06
parent79c150c51983431fe978cfec8f4fcd3cac8f07a0
parent1d560ff7f98880d06e4667936611beca802bd651
Merge branch 'dbus-1.6'

Conflicts:
NEWS
configure.ac