From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 19 Oct 2013 13:05:42 +0000 (+0200)
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=278280da9606d394ec7c39127ffadc26a5a3d3d0

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

278280da9606d394ec7c39127ffadc26a5a3d3d0