From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 3 Jul 2008 21:34:43 +0000 (+0300)
Subject: Merge branches 'master' and 'master' of ssh://rootserver/home/lennart/git/public... 
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=23ca50a5a56b6ea98a73480cff50ebb73ecba7ca;p=catta

Merge branches 'master' and 'master' of ssh://rootserver/home/lennart/git/public/avahi
---