Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 12 Jun 2013 13:49:37 +0000 (14:49 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 12 Jun 2013 13:49:37 +0000 (14:49 +0100)
commit51fe1c05aceaf058907007a25a2d46f30a9c83a6
tree96ea5a8f2f426aec9cad6bd143628d929a6ab152
parent9e800cbb0028d3674ba357570ff4109dfb99801f
parent22fd9df043aab7e1e344909c45cde472e93bd152
Merge branch 'dbus-1.6'

Conflicts:
NEWS
configure.ac
NEWS
dbus/dbus-sysdeps-unix.c
dbus/dbus-sysdeps-win.c