git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit

]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit

projects / people / pmueller / ipfire-2.x.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d9bf6d8 309b7de)

author	Stefan Schantl <stefan.schantl@ipfire.org>
	Sat, 14 Feb 2015 11:34:31 +0000 (12:34 +0100)
committer	Stefan Schantl <stefan.schantl@ipfire.org>
	Sat, 14 Feb 2015 11:34:31 +0000 (12:34 +0100)
commit	bc9446c65ff048ebce8c0665cc0efe2231fb37de
tree	a5187cc454351e5e889f0c4791fa48facca39b6e	tree \| snapshot
parent	d9bf6d8b2f195e8d1f0287af19cf9fed331e9377	commit \| diff
parent	309b7de86ec42c1ed395125d7dc022acfd56e500	commit \| diff

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen-geoip

Conflicts:
make.sh

config/firewall/rules.pl	diff1 \|	diff2 \|	blob \| history
config/rootfiles/common/stage2	diff1 \|	diff2 \|	blob \| history
lfs/stage2	diff1 \|	diff2 \|	blob \| history
make.sh	diff1 \|	diff2 \|	blob \| history

Peter's tree of IPFire 2.x