From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 30 Dec 2013 09:35:25 +0000 (+0100)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=481988c68d1380d918f42cb109a72c854826ffc7

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

481988c68d1380d918f42cb109a72c854826ffc7