projects / catta / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa40582 a72c56d)
Merge commit 'origin/master-tx'
authorLennart Poettering <lennart@poettering.net>
Fri, 12 Dec 2008 18:48:14 +0000 (19:48 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 12 Dec 2008 18:48:14 +0000 (19:48 +0100)

Trivial merge
A stripped-down version of the Avahi service discovery suite.