From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 26 Sep 2013 14:12:15 +0000 (+0200)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Tag: v2.15-beta1~245
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=ec9f81be0cee42529ac57c4f106144dfc1a934ec

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

ec9f81be0cee42529ac57c4f106144dfc1a934ec