From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 1 Dec 2013 13:09:02 +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=09efb767f43718512311357a5634d00c8ad8c32e

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

09efb767f43718512311357a5634d00c8ad8c32e