From: Alexander Marx <amarx@ipfire.org>
Date: Tue, 1 Oct 2013 18:30:30 +0000 (+0200)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen
X-Git-Tag: v2.15-beta1~195^2~7^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=753bb74ce55d5107d3e8001ed5c15f462261aab3;p=people%2Fms%2Fipfire-2.x.git

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

753bb74ce55d5107d3e8001ed5c15f462261aab3