From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 24 Aug 2013 20:30:15 +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/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=6ffa1bef03b981142217aecb02c6f00d4217a8ee;hp=-c

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

6ffa1bef03b981142217aecb02c6f00d4217a8ee