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

author	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 6 Apr 2008 22:10:23 +0000 (00:10 +0200)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Sun, 6 Apr 2008 22:10:23 +0000 (00:10 +0200)
commit	a95b533ea8b2480ce8c1b3eadfa590f210ff4bb3
tree	d645e357ea299fe716f7cfe51bb3c3b592cebf9e	tree \| snapshot
parent	1503c95d4510ac033d4bf10852953ec63bd05065	commit \| diff
parent	e44bfaa31f477d79ecdf203b365cda6fc422fdee	commit \| diff

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

Conflicts:

lfs/initramfs