From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 16 Jan 2014 21:00:53 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.15-beta2~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c27850183cce88fa26024be063a71a002bca5111;p=people%2Fms%2Fipfire-2.x.git

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

c27850183cce88fa26024be063a71a002bca5111