From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 11 Jan 2014 13:20:16 +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
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=621e8d148b27125db48f50f0b11bd75454d909bb;p=ipfire-2.x.git

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

621e8d148b27125db48f50f0b11bd75454d909bb