Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_...
authorAlf Høgemark <alf@i100.no>
Sat, 15 Mar 2014 07:47:56 +0000 (08:47 +0100)
committerAlf Høgemark <alf@i100.no>
Sat, 15 Mar 2014 07:47:56 +0000 (08:47 +0100)
commit3a60bf3483d0f40deba348c120df3e75da7b3ce0
tree268aefa306f71804148bfd497cd73a434f49d756
parent326a764de66971d2c78d2e45225d8985ca4ac3be
parent2b6c5f257980b0f9e4d31f26ac1945092a45df6a
Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_centergraph
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl