From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 6 Sep 2012 09:22:24 +0000 (+0200)
Subject: Merge branch 'master' into core61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fcore61;p=ipfire-2.x.git

Merge branch 'master' into core61
---

a3111c4391b3cdc12c389c5367ca9f8e3c1a8353