From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 27 Mar 2014 14:07:26 +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=1e4b7130e1e0a05ae5c939122d6f88708bbf8531;hp=-c

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

1e4b7130e1e0a05ae5c939122d6f88708bbf8531