From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 16 Jul 2013 06:36:54 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.13-core71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15f78770b1d4ee730dca39166590393e3b24a666;p=people%2Fms%2Fipfire-2.x.git

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

15f78770b1d4ee730dca39166590393e3b24a666