From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 11 Jan 2014 11:46:56 +0000 (+0100)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Tag: v2.15-beta1~2^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68e89a2f2828084bbe7a8fa15a16ae9626d4c74e;p=ipfire-2.x.git

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

68e89a2f2828084bbe7a8fa15a16ae9626d4c74e