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

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Thu, 19 Aug 2010 12:49:57 +0000 (14:49 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Thu, 19 Aug 2010 12:49:57 +0000 (14:49 +0200)
commit	0b1d3e68d50513e0b119b455b652d80727060af0
tree	57760ebacfdae3dbd5b002c4a6502c8b4f5763a8	tree \| snapshot
parent	927eb20ae3c6ecaa0a5795335263f636fd549382	commit \| diff
parent	7829d1d0195d99cdb30790909d9edf25ec0e40da	commit \| diff

Merge branch 'master' into next

Conflicts:
config/rootfiles/core/40/filelists/files
config/rootfiles/core/40/update.sh