From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 18 Mar 2014 17:00:42 +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=df1f687b28c28b1b6721cd3f02ce043e9d433bfc;hp=-c

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

df1f687b28c28b1b6721cd3f02ce043e9d433bfc