From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 8 Jan 2014 16:20:07 +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=4ed7ef4620637d6047edc4fd713e753d3a7f254e

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

4ed7ef4620637d6047edc4fd713e753d3a7f254e