From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 4 Mar 2014 13:14:36 +0000 (+0100)
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=8225c4fc98da65f37e4fe1535dee46a27522ac3a

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

8225c4fc98da65f37e4fe1535dee46a27522ac3a