From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 17 Dec 2012 15:10:02 +0000 (+0100)
Subject: Merge branch 'master' into core65
X-Git-Tag: v2.11-core65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=220c93308985f3e3df4d689a08cf17359f9fb35b;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' into core65
---

220c93308985f3e3df4d689a08cf17359f9fb35b