projects
/
platform
/
upstream
/
avahi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b9a4269
77dedcc
)
Merge remote-tracking branch 'origin/master-tx'
author
Lennart Poettering
<lennart@poettering.net>
Sat, 2 Apr 2011 01:23:36 +0000
(
03:23
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Sat, 2 Apr 2011 01:23:36 +0000
(
03:23
+0200)
Trivial merge