projects / platform / upstream / avahi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d1b8e8 0c3c50c)
Merge branch 'master-tx'
authorLennart Poettering <lennart@poettering.net>
Fri, 8 Aug 2008 14:45:17 +0000 (16:45 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 8 Aug 2008 14:45:17 +0000 (16:45 +0200)

Trivial merge
Domain: Network & Connectivity / Data Network;