From: Arne Fitzenreiter <arne_f@git.ipfire.org>
Date: Thu, 8 Sep 2011 12:34:24 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.9-core53~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1854dfab2a7eae43135ccd11037e51c8585877d0;p=ipfire-2.x.git

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
---

1854dfab2a7eae43135ccd11037e51c8585877d0