From: Alexander Marx <amarx@ipfire.org>
Date: Mon, 7 Oct 2013 05:25:19 +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~191^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95c86656e70af668d25f0a33afb3913ee5e2ded0;p=ipfire-2.x.git

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

95c86656e70af668d25f0a33afb3913ee5e2ded0