From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 12 Jan 2014 18:05:54 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.15-beta2~97^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07e9a1357dadb1a2b40d0d85aa956331eaa6b537;p=ipfire-2.x.git

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

07e9a1357dadb1a2b40d0d85aa956331eaa6b537