From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 14 Nov 2013 10:41:18 +0000 (+0100)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Tag: v2.15-beta1~150
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=1187d46e65e9938fab90fb463a8c3ee15e4a646a

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

1187d46e65e9938fab90fb463a8c3ee15e4a646a