Merge branch 'master' of ssh://rootserver/home/lennart/git/public/avahi
authorLennart Poettering <lennart@poettering.net>
Tue, 31 Mar 2009 23:03:34 +0000 (01:03 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 31 Mar 2009 23:03:34 +0000 (01:03 +0200)
commit46a562d5c8273d383dc4374f033d9664f5bb6fa5
tree3924665693f0d2b97ab511722abe0cbd8437c727
parent7651d6d3ae3dc60862261f35ab256ced9a5a0c1a
parentf37ae8b0f302a089baae50b18195b03c2f789ea4
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/avahi