Merge branch 'next-geoip' into core-90-geoip
authorStefan Schantl <stefan.schantl@ipfire.org>
Wed, 15 Apr 2015 15:10:49 +0000 (17:10 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Wed, 15 Apr 2015 15:10:49 +0000 (17:10 +0200)
commite6c4f090b694a8d102da5b2765dcdac871f20517
tree2b12037b09ec1bb9a579f6128877b2594155a991
parent30986dbf03b2ce231f3a53989d4d81ec7ccb1681
parent054d584786a60ed443d96642eb5a094e265da637
Merge branch 'next-geoip' into core-90-geoip
config/rootfiles/common/stage2
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
lfs/stage2
make.sh