From: Alexander Marx <amarx@ipfire.org>
Date: Wed, 5 Jun 2013 20:11:44 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into pre-firewall
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=62a77cbfbe2c5cb835c533eb78b7760edd1e7e1d;hp=-c

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

62a77cbfbe2c5cb835c533eb78b7760edd1e7e1d