From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 16 Dec 2012 09:13:57 +0000 (+0100)
Subject: Merge branch 'master' into core65
X-Git-Tag: v2.11-core65~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95d87c3ed9ad39614a1c9449d96c9f4e5f066922;p=ipfire-2.x.git

Merge branch 'master' into core65
---

95d87c3ed9ad39614a1c9449d96c9f4e5f066922