From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 2 May 2012 14:55:26 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.13-beta1~357^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c166bf2a6a3d8d8df1ad29b6e631671cc33536d;p=ipfire-2.x.git

Merge branch 'master' into next
---

9c166bf2a6a3d8d8df1ad29b6e631671cc33536d