From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 5 Jul 2013 13:18:37 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.13-core71~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e1cf5d9604b5c9b3c7995f460245583eff809ea;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' into next
---

2e1cf5d9604b5c9b3c7995f460245583eff809ea