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

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Mon, 30 Aug 2010 19:40:55 +0000 (21:40 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Mon, 30 Aug 2010 19:40:55 +0000 (21:40 +0200)
commit	6a0328658a0a3ca9b9bcdb95aedc427ebd5196ae
tree	4f356c1c33df098daf0d5e9615d6bec7149cd5e4	tree \| snapshot
parent	b6af41a572eb83e73875b1f8d450405fbee8eb0a	commit \| diff
parent	4247f58a1295e4f8748eea61baf5f9aa03872806	commit \| diff

Merge branch 'master' into next

Conflicts:
config/rootfiles/core/40/filelists/files