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)
commit296a73a5326636a53c642dcd046b03fcff221835
tree6f15e5d1669209d8de9b560c7bad6108717cd44b
parentdd29d563a603b0bc182af23efd5160caf75657c4
parentfff2be22a4f97ff5b0479b1f261e783b2737ee92
Merge remote-tracking branch 'alfh/feature_firewalllogcountry' into beyond-next

Conflicts:
langs/de/cgi-bin/de.pl
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl