]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commit
Merge branch 'guardian-2.0' into next-guardian-geoip
authorStefan Schantl <stefan.schantl@ipfire.org>
Thu, 5 Mar 2015 18:42:34 +0000 (19:42 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Thu, 5 Mar 2015 18:42:34 +0000 (19:42 +0100)
commitf3afb2d38f8f62c443032c4fffa8be63752ab694
tree36177241d8c59d4f7fc2f591415a6ca816a99023
parent0f0e30dced66fd281573c10b366d3add83ca3d16
parent4c5e2e34fd642949f351b5d98bd3d1abd9a05d40
Merge branch 'guardian-2.0' into next-guardian-geoip

Conflicts:
make.sh
src/misc-progs/Makefile
html/cgi-bin/ids.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
make.sh
src/misc-progs/Makefile