Merge branch 'doc-search-paths-35306'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 10 Feb 2012 10:10:12 +0000 (10:10 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 10 Feb 2012 10:10:17 +0000 (10:10 +0000)
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35306
Reviewed-by: Lennart Poettering <lennart@poettering.net>
1  2 
doc/dbus-specification.xml

Simple merge