Merge branch 'master' of ssh://rootserver/home/lennart/git/public/avahi
authorLennart Poettering <lennart@poettering.net>
Wed, 6 Aug 2008 13:57:28 +0000 (16:57 +0300)
committerLennart Poettering <lennart@poettering.net>
Wed, 6 Aug 2008 13:57:28 +0000 (16:57 +0300)
commit0f4e5df89826ac152c1091ca41f44ff283b4a590
tree5b171bd9850f5b1e554ea01d66ec723cff287eff
parent23ca50a5a56b6ea98a73480cff50ebb73ecba7ca
parentd6ce91c0b5258c2e107415704413f42edfab2c30
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/avahi