]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2f8244 4bc434b)
Merge remote-tracking branch 'jlentfer/igmpproxy' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 13 Jun 2013 11:49:04 +0000 (13:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 13 Jun 2013 11:49:04 +0000 (13:49 +0200)

Trivial merge
IPFire 2.x development tree