From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 4 Oct 2013 12:53:03 +0000 (+0200)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Tag: v2.15-beta1~211
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4598f16cfddf949149f4b00f554d8991a192a84f;p=people%2Fms%2Fipfire-2.x.git

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

4598f16cfddf949149f4b00f554d8991a192a84f