Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 16 Sep 2013 11:55:13 +0000 (12:55 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 16 Sep 2013 11:55:13 +0000 (12:55 +0100)
1  2 
dbus/dbus-server-socket.c

Simple merge