Merge branch 'system-search-paths-21620'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 10 Feb 2012 10:10:36 +0000 (10:10 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 10 Feb 2012 10:10:38 +0000 (10:10 +0000)
commit21c8094040bba43b5cc5aae016b57eb3b0cac450
treed5ba49e1002743306f392b1f1794e9470f0bca00
parent349260f245d95a6c8bcc0f000be1f3232c616052
parentfccb5a0fe11a2293ba5bfc09e0f3fe296d724eb2
Merge branch 'system-search-paths-21620'

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=21620
Reviewed-by: Lennart Poettering <lennart@poettering.net>
doc/dbus-specification.xml