Merge remote-tracking branch 'alfh/feature_firewalllogcountry' into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:15:49 +0000 (23:15 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:15:49 +0000 (23:15 +0100)
Conflicts:
langs/de/cgi-bin/de.pl

1  2 
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl

Simple merge
Simple merge