From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 7 Jan 2014 19:22:53 +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=bf7746ef83f0afeb6764b23336783e4a0e221eff

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

bf7746ef83f0afeb6764b23336783e4a0e221eff