Merge remote-tracking branch 'freedesktop/master'
authorJacek Janczyk <j.janczyk@samsung.com>
Wed, 4 Sep 2013 09:29:31 +0000 (11:29 +0200)
committerJacek Janczyk <j.janczyk@samsung.com>
Wed, 4 Sep 2013 09:50:03 +0000 (11:50 +0200)
commit78ef897dc74f0c74abe7cc164d91568a454f92ff
tree4179f3669b17e32ba3131bdba59a5b810933e4b1
parent7e333b51c0b9267b56ebf39ed84e5aa546412cf4
parent30e7a81302a60adc4ec497deee3c0dfe8ec1123e
Merge remote-tracking branch 'freedesktop/master'

Conflicts:
dbus/dbus-connection.c
dbus/dbus-transport.c

Change-Id: Ifb1872f1317bb1fa656d7088c1985ff778b76eba
configure.ac
dbus/Makefile.am
dbus/dbus-auth.c
dbus/dbus-bus.c
dbus/dbus-connection.c
dbus/dbus-message.c
dbus/dbus-transport-kdbus.c
dbus/dbus-transport-socket.c
dbus/dbus-transport.c
dbus/dbus-transport.h
test/marshal.c