Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_...
authorAlf Høgemark <alf@i100.no>
Sat, 15 Feb 2014 14:13:16 +0000 (15:13 +0100)
committerAlf Høgemark <alf@i100.no>
Sat, 15 Feb 2014 14:13:16 +0000 (15:13 +0100)
1  2 
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl

Simple merge
Simple merge