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

author	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 6 Apr 2008 12:59:39 +0000 (14:59 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 6 Apr 2008 12:59:39 +0000 (14:59 +0200)
commit	a9cafde0fbb8313f9f50369f7a668adcaa8481ac
tree	2e296b8c35a7492f4db114e96084d61e2f2a6964	tree \| snapshot
parent	23728a271fb92dc5e459f30b6a2bae71e13be363	commit \| diff
parent	26542ce2532d152bdd8a4b4349255fd80435a7d3	commit \| diff

Merge branch 'master' of git://git.ipfire.org/ipfire-3.x

Conflicts:

lfs/initramfs