Merge branch 'static-routing' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 Jul 2011 17:38:29 +0000 (19:38 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 Jul 2011 17:38:29 +0000 (19:38 +0200)
commit3717a205a61b582ba5426da008a548bf98085742
tree1b50f3be0a3e94feb0d2f3745fc6b2d8b55866a3
parente1b8a853237eb16a3cfc1a98ddd9b3ef2bdfe095
parentdaf9669080f7b03530bdebcfee822697c89242c5
Merge branch 'static-routing' into next