From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 29 Dec 2013 19:32:47 +0000 (+0100)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Tag: v2.15-beta1~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d2c3affcd2992461fac5bba54dbff551eaafb72;p=people%2Fms%2Fipfire-2.x.git

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

3d2c3affcd2992461fac5bba54dbff551eaafb72