From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 24 Jan 2012 20:44:16 +0000 (+0100)
Subject: Merge commit 'origin/static-routes'
X-Git-Tag: v2.11-core56^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a3329bce4445711a0f5f982bee7648f7ed40cb8;p=people%2Fstevee%2Fipfire-2.x.git

Merge commit 'origin/static-routes'
---

2a3329bce4445711a0f5f982bee7648f7ed40cb8