From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 16 Nov 2012 16:14:30 +0000 (+0100)
Subject: Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen
X-Git-Tag: v2.13-beta1~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b33c0aee3eb914489806492ab8ee9345c5af261f;p=people%2Fms%2Fipfire-2.x.git

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

b33c0aee3eb914489806492ab8ee9345c5af261f