From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 9 Dec 2013 16:13:34 +0000 (+0100)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Tag: v2.15-beta1~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e39ac92dd298fee0e546638c36f568978398a5f1;p=people%2Fms%2Fipfire-2.x.git

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

e39ac92dd298fee0e546638c36f568978398a5f1