From: Alexander Marx Date: Tue, 1 Oct 2013 18:30:06 +0000 (+0200) Subject: Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire... X-Git-Tag: v2.15-beta1~191^2~7^2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ad3c084eef6d82a8690e5d488d84c61e892ef4e;p=ipfire-2.x.git Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen --- 2ad3c084eef6d82a8690e5d488d84c61e892ef4e