From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 6 Jan 2014 07:56:31 +0000 (+0100)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Tag: v2.15-beta1~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4b373993fb60809901e7c45d690f569b0d8867c;p=people%2Fms%2Fipfire-2.x.git

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

f4b373993fb60809901e7c45d690f569b0d8867c