From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 5 Sep 2011 20:57:09 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.9-core53~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39b14828cabf647dd505a7f5da956c7bb1f98f9e;p=people%2Fstevee%2Fipfire-2.x.git

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

39b14828cabf647dd505a7f5da956c7bb1f98f9e