From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 15 Sep 2013 16:42:33 +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=5a6804a2472af03dd6744bb3385408d369659931

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

5a6804a2472af03dd6744bb3385408d369659931