Merge branch 'seventeen-geoip' into next-geoip
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 15 Mar 2015 10:38:45 +0000 (11:38 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 15 Mar 2015 10:38:45 +0000 (11:38 +0100)
commit93bfe63d55bf611887fbc25c251c6fb0ce2ab1d4
tree4cbf527eb360e57f1f6223cdc9ce0b3114a4d749
parente60cd3a4042e95cf2748aac2de9d991c724ef24d
parentb9ca2fa60f1ac0127d0bbddb016d0acb578e660d
Merge branch 'seventeen-geoip' into next-geoip
config/firewall/rules.pl
config/rootfiles/common/stage2
html/cgi-bin/firewall.cgi
html/cgi-bin/fwhosts.cgi
langs/en/cgi-bin/en.pl
make.sh