Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus
authorRalf Habacker <ralf.habacker@freenet.de>
Fri, 8 Oct 2010 19:09:01 +0000 (21:09 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Fri, 8 Oct 2010 19:09:01 +0000 (21:09 +0200)
commit083027330685067f096b2f278abc2aec1f15aa7f
treec6a1f35836b2b9f061d560240911234c8d582c36
parentd6824bc618a7fd5ffc2c981a4aab85b54c110099
parenta96fcb19d1e359207cbda355774851ab1bbbb81d
Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus