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