From: Alexander Marx <amarx@ipfire.org>
Date: Wed, 2 Oct 2013 19:15:22 +0000 (+0200)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=40d505ea08931038fba56ee3a8da5053ad7ed389

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

40d505ea08931038fba56ee3a8da5053ad7ed389