From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 27 Dec 2011 10:11:25 +0000 (+0100)
Subject: Merge branch 'core54'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c3fec29d0687950251a7fb9828dc3867631487b;p=people%2Fteissler%2Fipfire-2.x.git

Merge branch 'core54'
---

7c3fec29d0687950251a7fb9828dc3867631487b