From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 18 Feb 2013 06:47:45 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.13-core67~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7135f608ba972cf2d83f198870720fabfca32e2c;p=ipfire-2.x.git

Merge branch 'master' into next
---

7135f608ba972cf2d83f198870720fabfca32e2c