From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 10 Nov 2012 21:59:53 +0000 (+0100)
Subject: Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen
X-Git-Tag: v2.13-beta1~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a1da02bd94f0b587fc74b59217363239057f8fe;p=ipfire-2.x.git

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

7a1da02bd94f0b587fc74b59217363239057f8fe