From: Michael Tremer Date: Thu, 20 Mar 2014 22:15:49 +0000 (+0100) Subject: Merge remote-tracking branch 'alfh/feature_firewalllogcountry' into beyond-next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=296a73a5326636a53c642dcd046b03fcff221835;p=people%2Fms%2Fipfire-2.x.git Merge remote-tracking branch 'alfh/feature_firewalllogcountry' into beyond-next Conflicts: langs/de/cgi-bin/de.pl --- 296a73a5326636a53c642dcd046b03fcff221835