From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 14 Oct 2013 12:56:20 +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=fa9ef0a616a8c5f536c9f6f5d9a10a088bea5488

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

fa9ef0a616a8c5f536c9f6f5d9a10a088bea5488