]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4de56d3 5aa11a4)
Merge remote-tracking branch 'stevee/avahi'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 May 2012 14:51:16 +0000 (16:51 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 20 May 2012 14:51:16 +0000 (16:51 +0200)

Trivial merge
IPFire 3.x development tree