From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 20 Dec 2012 20:02:50 +0000 (+0100)
Subject: Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen
X-Git-Tag: v2.13-beta1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e54330e01e20314f796543d2d2e5eb34ee43caf3;p=people%2Fpmueller%2Fipfire-2.x.git

Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen
---

e54330e01e20314f796543d2d2e5eb34ee43caf3