From: Alexander Marx Date: Mon, 7 Oct 2013 05:25:42 +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~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58bda09b683311db948fb5be06b1521386286f03;p=ipfire-2.x.git Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen --- 58bda09b683311db948fb5be06b1521386286f03