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)
commit10dfb491b13b4e11460cd10f3bbca21016002d20
tree52a9095b987b7536a17609e98824b6e88f78ee33
parenta1219d9600a5c17255e5c656e10860ccddc49c6f
parente3cbe60f5d46bbef7e4e257fbbae5a49f91d06df
Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_first_last
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl