From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 10 Jan 2014 19:31:03 +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=3547adad97669b65c9b11eb69aa36fd41a2484d0;hp=-c

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

3547adad97669b65c9b11eb69aa36fd41a2484d0