From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 25 May 2014 08:06:05 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f31e2c38d331bf27c4c0610f59a2df2683dac03;p=people%2Fms%2Fipfire-2.x.git

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

8f31e2c38d331bf27c4c0610f59a2df2683dac03