Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen-geoip
authorStefan Schantl <stefan.schantl@ipfire.org>
Sat, 14 Feb 2015 11:34:31 +0000 (12:34 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sat, 14 Feb 2015 11:34:31 +0000 (12:34 +0100)
commitbc9446c65ff048ebce8c0665cc0efe2231fb37de
treea5187cc454351e5e889f0c4791fa48facca39b6e
parentd9bf6d8b2f195e8d1f0287af19cf9fed331e9377
parent309b7de86ec42c1ed395125d7dc022acfd56e500
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen-geoip

Conflicts:
make.sh
config/firewall/rules.pl
config/rootfiles/common/stage2
lfs/stage2
make.sh