From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 17 Dec 2012 09:15:44 +0000 (+0100)
Subject: Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen
X-Git-Tag: v2.13-beta1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d65e0bd38d3bf816c854d57d520bea9836959747;p=people%2Fms%2Fipfire-2.x.git

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

d65e0bd38d3bf816c854d57d520bea9836959747