From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 14 Jan 2014 21:35:11 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.15-beta2~93^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d99f0ff8c620a7fa832354d403cf701120273d40;p=ipfire-2.x.git

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

d99f0ff8c620a7fa832354d403cf701120273d40