From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 26 Feb 2014 16:59:53 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.15-rc1~90^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adce3f96fc5c0b817d2742eed6065706aef9e210;p=people%2Fms%2Fipfire-2.x.git

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

adce3f96fc5c0b817d2742eed6065706aef9e210